Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand most runfile zip arguments at execution rather than analysis. #14903

Closed
wants to merge 1 commit into from
Closed

Expand most runfile zip arguments at execution rather than analysis. #14903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/bazel/rules/python/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ java_library(
deps = [
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/actions:commandline_item",
"//src/main/java/com/google/devtools/build/lib/analysis:actions/custom_command_line",
"//src/main/java/com/google/devtools/build/lib/analysis:actions/launcher_file_write_action",
"//src/main/java/com/google/devtools/build/lib/analysis:actions/substitution",
Expand Down
40 changes: 36 additions & 4 deletions src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.CommandLineItem;
import com.google.devtools.build.lib.actions.ParamFileInfo;
import com.google.devtools.build.lib.actions.ParameterFile;
import com.google.devtools.build.lib.analysis.AnalysisUtils;
Expand All @@ -32,6 +33,7 @@
import com.google.devtools.build.lib.analysis.ShToolchain;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg;
import com.google.devtools.build.lib.analysis.actions.LauncherFileWriteAction;
import com.google.devtools.build.lib.analysis.actions.LauncherFileWriteAction.LaunchInfo;
import com.google.devtools.build.lib.analysis.actions.SpawnAction;
Expand All @@ -54,6 +56,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -342,6 +345,34 @@ private static String getZipRunfilesPath(
return getZipRunfilesPath(PathFragment.create(path), workspaceName, legacyExternalRunfiles);
}

private static final class ZipFilePathExpander implements CommandLineItem.MapFn<Artifact> {
private final Artifact executable;
private final Artifact zipFile;
private final PathFragment workspaceName;
private final boolean legacyExternalRunfiles;

private ZipFilePathExpander(
Artifact executable,
Artifact zipFile,
PathFragment workspaceName,
boolean legacyExternalRunfiles) {
this.executable = executable;
this.zipFile = zipFile;
this.workspaceName = workspaceName;
this.legacyExternalRunfiles = legacyExternalRunfiles;
}

@Override
public void expandToCommandLine(Artifact artifact, Consumer<String> args) {
if (!artifact.equals(zipFile) && !artifact.equals(executable)) {
args.accept(
getZipRunfilesPath(artifact.getRunfilesPath(), workspaceName, legacyExternalRunfiles)
+ "="
+ artifact.getExecPathString());
}
}
}

private static void createPythonZipAction(
RuleContext ruleContext,
Artifact executable,
Expand All @@ -367,12 +398,13 @@ private static void createPythonZipAction(

// Read each runfile from execute path, add them into zip file at the right runfiles path.
// Filter the executable file, cause we are building it.
argv.addAll(
VectorArg.of(runfilesSupport.getRunfilesArtifacts())
.mapped(
new ZipFilePathExpander(
executable, zipFile, workspaceName, legacyExternalRunfiles)));
for (Artifact artifact : runfilesSupport.getRunfilesArtifacts().toList()) {
if (!artifact.equals(executable) && !artifact.equals(zipFile)) {
argv.addDynamicString(
getZipRunfilesPath(artifact.getRunfilesPath(), workspaceName, legacyExternalRunfiles)
+ "="
+ artifact.getExecPathString());
inputsBuilder.add(artifact);
}
}
Expand Down