Support VFSOverlay

ifood · Oct 18, 2022 · 8ec5915 · 8ec5915
1 parent e9d3b2f
commit 8ec5915
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/com/facebook/buck/swift/SwiftCompile.java b/src/com/facebook/buck/swift/SwiftCompile.java
@@ -206,7 +206,9 @@ private SwiftCompileStep makeCompileStep(SourcePathResolverAdapter resolver) {
         projectFilesystem,
         argfilePath,
         withDownwardApi,
-        transformErrorsToAbsolutePaths);
+        transformErrorsToAbsolutePaths,
+        vfsOverlay,
+        vfsoverlayFilePath);
   }
 
   /**

diff --git a/src/com/facebook/buck/swift/SwiftCompileStep.java b/src/com/facebook/buck/swift/SwiftCompileStep.java
@@ -55,6 +55,8 @@ class SwiftCompileStep extends SwiftCompileStepBase {
   private final ImmutableMap<String, String> compilerEnvironment;
   private final Optional<AbsPath> argfilePath;
   private final boolean transformErrorsToAbsolutePaths;
+  private final Optional<AbsPath> vfsOverlayFile;
+  private final Optional<VFSOverlay> vfsOverlay;
   SwiftCompileStep(
       AbsPath compilerCwd,
       Map<String, String> compilerEnvironment,
@@ -63,12 +65,16 @@ class SwiftCompileStep extends SwiftCompileStepBase {
       ProjectFilesystem filesystem,
       Optional<AbsPath> argfilePath,
       boolean withDownwardApi,
-      boolean transformErrorsToAbsolutePaths) {
+      boolean transformErrorsToAbsolutePaths,
+      Optional<VFSOverlay> vfsOverlay,
+      Optional<AbsPath> vfsOverlayFile) {
     super(
         compilerCwd, compilerCommandPrefix, compilerCommandArguments, filesystem, withDownwardApi);
     this.compilerEnvironment = ImmutableMap.copyOf(compilerEnvironment);
     this.argfilePath = argfilePath;
     this.transformErrorsToAbsolutePaths = transformErrorsToAbsolutePaths;
+    this.vfsOverlay = vfsOverlay;
+    this.vfsOverlayFile = vfsOverlayFile;
   }
 
   @Override
@@ -82,6 +88,10 @@ private ProcessExecutorParams makeProcessExecutorParams(StepExecutionContext con
     builder.setDirectory(compilerCwd.getPath());
     builder.setEnvironment(compilerEnvironment);
 
+    if (vfsOverlay.isPresent() && vfsOverlayFile.isPresent()) {
+      MostFiles.writeLinesToFile(ImmutableList.of(vfsOverlay.get().render()), vfsOverlayFile.get());
+    }
+
     Iterable<String> colorArguments = getColorArguments(context.getAnsi().isAnsiTerminal());
 
     if (argfilePath.isPresent()) {

diff --git a/src/com/facebook/buck/swift/SwiftInterfaceCompile.java b/src/com/facebook/buck/swift/SwiftInterfaceCompile.java
@@ -16,8 +16,12 @@
 
 package com.facebook.buck.swift;
 
+import com.facebook.buck.apple.clang.VFSOverlay;
 import com.facebook.buck.core.build.context.BuildContext;
+import com.facebook.buck.core.filesystems.AbsPath;
 import com.facebook.buck.core.model.BuildTarget;
+import com.facebook.buck.core.model.impl.BuildPaths;
+import com.facebook.buck.core.model.impl.BuildTargetPaths;
 import com.facebook.buck.core.rulekey.AddToRuleKey;
 import com.facebook.buck.core.rules.SourcePathRuleFinder;
 import com.facebook.buck.core.sourcepath.SourcePath;
@@ -36,6 +40,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedMap;
 import java.nio.file.Path;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -149,7 +154,9 @@ public ImmutableList<Step> getBuildSteps(
               filesystem,
               Optional.empty(),
               withDownwardApi,
-              false));
+              false,
+              Optional.empty(),
+              Optional.empty()));
     }
   }
 }
diff --git a/src/com/facebook/buck/swift/SwiftModuleMapCompile.java b/src/com/facebook/buck/swift/SwiftModuleMapCompile.java
@@ -241,7 +241,9 @@ public ImmutableList<Step> getBuildSteps(
               filesystem,
               Optional.empty(),
               withDownwardApi,
-              false));
+              false,
+              Optional.empty(),
+              Optional.empty()));
     }
 
     private boolean isFrameworkPath(Path modulemapPath) {