diff options
5 files changed, 61 insertions, 62 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java index a2269fbecb..de74e2cf91 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java @@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; 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.LauncherFileWriteAction; import com.google.devtools.build.lib.analysis.actions.LauncherFileWriteAction.LaunchInfo; @@ -40,6 +41,10 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; +import com.google.devtools.build.lib.rules.cpp.CcLinkParams; +import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore; +import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; +import com.google.devtools.build.lib.rules.python.PyCcLinkParamsProvider; import com.google.devtools.build.lib.rules.python.PyCommon; import com.google.devtools.build.lib.rules.python.PythonConfiguration; import com.google.devtools.build.lib.rules.python.PythonSemantics; @@ -70,7 +75,10 @@ public class BazelPythonSemantics implements PythonSemantics { @Override public void collectRunfilesForBinary( - RuleContext ruleContext, Runfiles.Builder builder, PyCommon common) { + RuleContext ruleContext, + Runfiles.Builder builder, + PyCommon common, + CcLinkingInfo ccLinkingInfo) { addRuntime(ruleContext, builder); } @@ -128,7 +136,7 @@ public class BazelPythonSemantics implements PythonSemantics { public Artifact createExecutable( RuleContext ruleContext, PyCommon common, - AbstractCcLinkParamsStore ccLinkParamsStore, + CcLinkingInfo ccLinkingInfo, NestedSet<PathFragment> imports) throws InterruptedException { String main = common.determineMainExecutableSource(/*withWorkspaceName=*/ true); @@ -354,4 +362,21 @@ public class BazelPythonSemantics implements PythonSemantics { return pythonBinary; } + @Override + public CcLinkingInfo buildCcLinkingInfoProvider( + Iterable<? extends TransitiveInfoCollection> deps) { + CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); + AbstractCcLinkParamsStore ccLinkParamsStore = + new AbstractCcLinkParamsStore() { + @Override + protected void collect( + CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { + builder.addTransitiveTargets( + deps, CcLinkParamsStore.TO_LINK_PARAMS, PyCcLinkParamsProvider.TO_LINK_PARAMS); + } + }; + // TODO(plf): return empty CcLinkingInfo. + ccLinkingInfoBuilder.setCcLinkParamsStore(new CcLinkParamsStore(ccLinkParamsStore)); + return ccLinkingInfoBuilder.build(); + } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java index 41e19c497c..b8c449529f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyBinary.java @@ -24,10 +24,7 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.collect.nestedset.NestedSet; -import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; import com.google.devtools.build.lib.rules.cpp.CcCommon.CcFlagsSupplier; -import com.google.devtools.build.lib.rules.cpp.CcLinkParams; -import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore; import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.vfs.PathFragment; @@ -60,7 +57,6 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory { static RuleConfiguredTargetBuilder init(RuleContext ruleContext, PythonSemantics semantics, PyCommon common) throws InterruptedException { ruleContext.initConfigurationMakeVariableContext(new CcFlagsSupplier(ruleContext)); - AbstractCcLinkParamsStore ccLinkParamsStore = initializeCcLinkParamStore(ruleContext); List<Artifact> srcs = common.validateSrcs(); List<Artifact> allOutputs = @@ -80,9 +76,10 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory { return null; } - Artifact realExecutable = - semantics.createExecutable(ruleContext, common, ccLinkParamsStore, imports); - Runfiles commonRunfiles = collectCommonRunfiles(ruleContext, common, semantics); + CcLinkingInfo ccLinkingInfo = + semantics.buildCcLinkingInfoProvider(ruleContext.getPrerequisites("deps", Mode.TARGET)); + + Runfiles commonRunfiles = collectCommonRunfiles(ruleContext, common, semantics, ccLinkingInfo); Runfiles.Builder defaultRunfilesBuilder = new Runfiles.Builder( ruleContext.getWorkspaceName(), ruleContext.getConfiguration().legacyExternalRunfiles()) @@ -124,19 +121,22 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory { semantics.postInitBinary(ruleContext, runfilesSupport, common); - CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); - ccLinkingInfoBuilder.setCcLinkParamsStore(new CcLinkParamsStore(ccLinkParamsStore)); + Artifact realExecutable = + semantics.createExecutable(ruleContext, common, ccLinkingInfo, imports); return builder .setFilesToBuild(common.getFilesToBuild()) .add(RunfilesProvider.class, runfilesProvider) .setRunfilesSupport(runfilesSupport, realExecutable) - .addNativeDeclaredProvider(ccLinkingInfoBuilder.build()) .add(PythonImportsProvider.class, new PythonImportsProvider(imports)); } - private static Runfiles collectCommonRunfiles(RuleContext ruleContext, PyCommon common, - PythonSemantics semantics) { + private static Runfiles collectCommonRunfiles( + RuleContext ruleContext, + PyCommon common, + PythonSemantics semantics, + CcLinkingInfo ccLinkingInfo) + throws InterruptedException { Runfiles.Builder builder = new Runfiles.Builder( ruleContext.getWorkspaceName(), ruleContext.getConfiguration().legacyExternalRunfiles()); builder.addArtifact(common.getExecutable()); @@ -152,21 +152,7 @@ public abstract class PyBinary implements RuleConfiguredTargetFactory { || ruleContext.attributes().get("legacy_create_init", Type.BOOLEAN)) { builder.setEmptyFilesSupplier(PythonUtils.GET_INIT_PY_FILES); } - semantics.collectRunfilesForBinary(ruleContext, builder, common); + semantics.collectRunfilesForBinary(ruleContext, builder, common, ccLinkingInfo); return builder.build(); } - - private static AbstractCcLinkParamsStore initializeCcLinkParamStore( - final RuleContext ruleContext) { - return new AbstractCcLinkParamsStore() { - @Override - protected void collect( - CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { - builder.addTransitiveTargets( - ruleContext.getPrerequisites("deps", Mode.TARGET), - PyCcLinkParamsProvider.TO_LINK_PARAMS, - CcLinkParamsStore.TO_LINK_PARAMS); - } - }; - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCcLinkParamsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCcLinkParamsProvider.java index 8a270ac306..68d246d6b1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCcLinkParamsProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCcLinkParamsProvider.java @@ -18,26 +18,26 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; -import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore; +import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** A target that provides C++ libraries to be linked into Python targets. */ @Immutable @AutoCodec public final class PyCcLinkParamsProvider implements TransitiveInfoProvider { - private final CcLinkParamsStore store; + private final CcLinkingInfo ccLinkingInfo; - public PyCcLinkParamsProvider(CcLinkParamsStore store) { - this.store = store; + public PyCcLinkParamsProvider(CcLinkingInfo ccLinkingInfo) { + this.ccLinkingInfo = ccLinkingInfo; } - public AbstractCcLinkParamsStore getLinkParams() { - return store; + public CcLinkingInfo getCcLinkingInfo() { + return ccLinkingInfo; } public static final Function<TransitiveInfoCollection, AbstractCcLinkParamsStore> TO_LINK_PARAMS = input -> { PyCcLinkParamsProvider provider = input.getProvider(PyCcLinkParamsProvider.class); - return provider == null ? null : provider.getLinkParams(); + return provider == null ? null : provider.getCcLinkingInfo().getCcLinkParamsStore(); }; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java index e40a1ab978..1d8c7ec6d7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyLibrary.java @@ -25,10 +25,6 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; -import com.google.devtools.build.lib.rules.cpp.CcLinkParams; -import com.google.devtools.build.lib.rules.cpp.CcLinkParamsStore; -import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.ArrayList; import java.util.List; @@ -64,18 +60,6 @@ public abstract class PyLibrary implements RuleConfiguredTargetFactory { NestedSetBuilder.wrap(Order.STABLE_ORDER, allOutputs); common.addPyExtraActionPseudoAction(); - AbstractCcLinkParamsStore ccLinkParamsStore = - new AbstractCcLinkParamsStore() { - @Override - protected void collect( - CcLinkParams.Builder builder, boolean linkingStatically, boolean linkShared) { - builder.addTransitiveTargets( - ruleContext.getPrerequisites("deps", Mode.TARGET), - PyCcLinkParamsProvider.TO_LINK_PARAMS, - CcLinkParamsStore.TO_LINK_PARAMS); - } - }; - NestedSet<PathFragment> imports = common.collectImports(ruleContext, semantics); if (ruleContext.hasErrors()) { return null; @@ -94,13 +78,11 @@ public abstract class PyLibrary implements RuleConfiguredTargetFactory { RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext); common.addCommonTransitiveInfoProviders(builder, semantics, filesToBuild); - CcLinkingInfo.Builder ccLinkingInfoBuilder = CcLinkingInfo.Builder.create(); - ccLinkingInfoBuilder.setCcLinkParamsStore(new CcLinkParamsStore(ccLinkParamsStore)); - return builder .setFilesToBuild(filesToBuild) + .addNativeDeclaredProvider( + semantics.buildCcLinkingInfoProvider(ruleContext.getPrerequisites("deps", Mode.TARGET))) .add(RunfilesProvider.class, RunfilesProvider.simple(runfilesBuilder.build())) - .addNativeDeclaredProvider(ccLinkingInfoBuilder.build()) .add(PythonImportsProvider.class, new PythonImportsProvider(imports)) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonSemantics.java index ee282cbe00..2ca0bc2c53 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonSemantics.java @@ -17,9 +17,10 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesSupport; +import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector.InstrumentationSpec; import com.google.devtools.build.lib.collect.nestedset.NestedSet; -import com.google.devtools.build.lib.rules.cpp.AbstractCcLinkParamsStore; +import com.google.devtools.build.lib.rules.cpp.CcLinkingInfo; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.Collection; import java.util.List; @@ -36,10 +37,13 @@ public interface PythonSemantics { */ void validate(RuleContext ruleContext, PyCommon common); - /** - * Extends for the default and data runfiles of {@code py_binary} rules with custom elements. - */ - void collectRunfilesForBinary(RuleContext ruleContext, Runfiles.Builder builder, PyCommon common); + /** Extends for the default and data runfiles of {@code py_binary} rules with custom elements. */ + void collectRunfilesForBinary( + RuleContext ruleContext, + Runfiles.Builder builder, + PyCommon common, + CcLinkingInfo ccLinkingInfo) + throws InterruptedException; /** Extends the default runfiles of {@code py_binary} rules with custom elements. */ void collectDefaultRunfilesForBinary(RuleContext ruleContext, Runfiles.Builder builder) @@ -72,7 +76,7 @@ public interface PythonSemantics { Artifact createExecutable( RuleContext ruleContext, PyCommon common, - AbstractCcLinkParamsStore ccLinkParamsStore, + CcLinkingInfo ccLinkingInfo, NestedSet<PathFragment> imports) throws InterruptedException; @@ -82,4 +86,6 @@ public interface PythonSemantics { */ void postInitBinary(RuleContext ruleContext, RunfilesSupport runfilesSupport, PyCommon common) throws InterruptedException; + + CcLinkingInfo buildCcLinkingInfoProvider(Iterable<? extends TransitiveInfoCollection> deps); } |