diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc')
9 files changed, 36 insertions, 36 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java index 70556f01ce..6918e236b5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStubBinary.java @@ -162,7 +162,7 @@ public class AppleStubBinary implements RuleConfiguredTargetFactory { ruleContext.registerAction( ObjcRuleClasses.spawnAppleEnvActionBuilder(appleConfiguration, platform) .setExecutable(xcrunwrapper(ruleContext)) - .setCommandLine(copyCommandLine) + .addCommandLine(copyCommandLine) .setMnemonic("CopyStubExecutable") .addOutput(outputBinary) .disableSandboxing() diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java index d9d25fc5ba..9735630f3f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java @@ -240,7 +240,7 @@ final class BundleSupport { ObjcRuleClasses.spawnAppleEnvActionBuilder(appleConfiguration, platform) .setMnemonic("StoryboardCompile") .setExecutable(attributes.ibtoolWrapper()) - .setCommandLine(ibActionsCommandLine(archiveRoot, zipOutput, storyboardInput)) + .addCommandLine(ibActionsCommandLine(archiveRoot, zipOutput, storyboardInput)) .addOutput(zipOutput) .addInput(storyboardInput) .build(ruleContext)); @@ -290,7 +290,7 @@ final class BundleSupport { .setExecutable(attributes.momcWrapper()) .addOutput(outputZip) .addInputs(datamodel.getInputs()) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .addExecPath(outputZip) .addDynamicString(datamodel.archiveRootForMomczip()) @@ -319,7 +319,7 @@ final class BundleSupport { ObjcRuleClasses.spawnAppleEnvActionBuilder(appleConfiguration, platform) .setMnemonic("XibCompile") .setExecutable(attributes.ibtoolWrapper()) - .setCommandLine(ibActionsCommandLine(archiveRoot, zipOutput, original)) + .addCommandLine(ibActionsCommandLine(archiveRoot, zipOutput, original)) .addOutput(zipOutput) .addInput(original) // Disable sandboxing due to Bazel issue #2189. @@ -335,7 +335,7 @@ final class BundleSupport { ObjcRuleClasses.spawnAppleEnvActionBuilder(appleConfiguration, platform) .setMnemonic("ConvertStringsPlist") .setExecutable(PathFragment.create("/usr/bin/plutil")) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .add("-convert") .add("binary1") @@ -377,7 +377,7 @@ final class BundleSupport { .addTransitiveInputs(mergingContentArtifacts) .addOutput(bundling.getIntermediateArtifacts().mergedInfoplist()) .addInput(plMergeControlArtifact) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .addExecPath("--control", plMergeControlArtifact) .build()) @@ -420,10 +420,7 @@ final class BundleSupport { .addTransitiveInputs(objcProvider.get(ASSET_CATALOG)) .addOutput(zipOutput) .addOutput(actoolPartialInfoplist) - .setCommandLine(actoolzipCommandLine( - objcProvider, - zipOutput, - actoolPartialInfoplist)) + .addCommandLine(actoolzipCommandLine(objcProvider, zipOutput, actoolPartialInfoplist)) .disableSandboxing() .build(ruleContext)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index cf15e6082f..159821f0e5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -1138,7 +1138,7 @@ public abstract class CompilationSupport { .addTransitiveInputs(j2ObjcDependencyMappingFiles) .addTransitiveInputs(j2ObjcHeaderMappingFiles) .addTransitiveInputs(j2ObjcArchiveSourceMappingFiles) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder().addFormatted("@%s", paramFile.getExecPath()).build()) .addOutput(prunedJ2ObjcArchive) .build(ruleContext)); @@ -1231,7 +1231,7 @@ public abstract class CompilationSupport { appleConfiguration, appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcBinarySymbolStrip") .setExecutable(xcrunwrapper(ruleContext)) - .setCommandLine(symbolStripCommandLine(stripArgs, binaryToLink, strippedBinary)) + .addCommandLine(symbolStripCommandLine(stripArgs, binaryToLink, strippedBinary)) .addOutput(strippedBinary) .addInput(binaryToLink) .build(ruleContext)); @@ -1431,7 +1431,7 @@ public abstract class CompilationSupport { } ruleContext.registerAction( builder - .setCommandLine(cmdLine.add("--").addAll(args).build()) + .addCommandLine(cmdLine.add("--").addAll(args).build()) .addInputs(compilationArtifacts.getPrivateHdrs()) .addTransitiveInputs(attributes.hdrs()) .addTransitiveInputs(objcProvider.get(ObjcProvider.HEADER)) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index c90d5a7a62..a2daa20475 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.RuleContext; 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.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.ParameterFileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -567,7 +568,7 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF .addTransitiveInputs(depsHeaderMappingFiles) .addTransitiveInputs(depsClassMappingFiles) .addInput(paramFile) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder().addFormatted("@%s", paramFile.getExecPath()).build()) .addOutputs(j2ObjcSource.getObjcSrcs()) .addOutputs(j2ObjcSource.getObjcHdrs()) @@ -594,16 +595,18 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF "--source_jars", VectorArg.join(",").each(ImmutableList.copyOf(sourceJars))); } headerMapCommandLine.addExecPath("--output_mapping_file", outputHeaderMappingFile); - ruleContext.registerAction(new SpawnAction.Builder() - .setMnemonic("GenerateJ2objcHeaderMap") - .setExecutable(ruleContext.getPrerequisiteArtifact("$j2objc_header_map", Mode.HOST)) - .addInput(ruleContext.getPrerequisiteArtifact("$j2objc_header_map", Mode.HOST)) - .addInputs(sources) - .addInputs(sourceJars) - .setCommandLine(headerMapCommandLine.build()) - .useParameterFile(ParameterFileType.SHELL_QUOTED) - .addOutput(outputHeaderMappingFile) - .build(ruleContext)); + ruleContext.registerAction( + new SpawnAction.Builder() + .setMnemonic("GenerateJ2objcHeaderMap") + .setExecutable(ruleContext.getPrerequisiteArtifact("$j2objc_header_map", Mode.HOST)) + .addInput(ruleContext.getPrerequisiteArtifact("$j2objc_header_map", Mode.HOST)) + .addInputs(sources) + .addInputs(sourceJars) + .addCommandLine( + headerMapCommandLine.build(), + ParamFileInfo.builder(ParameterFileType.SHELL_QUOTED).build()) + .addOutput(outputHeaderMappingFile) + .build(ruleContext)); } return new J2ObjcMappingFileProvider( diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java index 4dc2556ce8..8eee5e22fa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java @@ -420,7 +420,7 @@ public class LegacyCompilationSupport extends CompilationSupport { compileBuilder .setMnemonic("ObjcCompile") .setExecutable(xcrunwrapper(ruleContext)) - .setCommandLine(commandLine) + .addCommandLine(commandLine) .addOutput(objFile) .addOutputs(gcnoFile.asSet()) .addOutput(dotdFile.artifact()) @@ -510,7 +510,7 @@ public class LegacyCompilationSupport extends CompilationSupport { appleConfiguration, appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcLink") .setExecutable(libtool(ruleContext)) - .setCommandLine( + .addCommandLine( new CustomCommandLine.Builder() .add("-static") .addExecPath("-filelist", objList) @@ -533,7 +533,7 @@ public class LegacyCompilationSupport extends CompilationSupport { appleConfiguration, appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcLink") .setExecutable(libtool(ruleContext)) - .setCommandLine( + .addCommandLine( new CustomCommandLine.Builder() .add("-static") .add("-arch_only", appleConfiguration.getSingleArchitecture()) @@ -634,7 +634,7 @@ public class LegacyCompilationSupport extends CompilationSupport { appleConfiguration, appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcLink") .setShellCommand(ImmutableList.of("/bin/bash", "-c")) - .setCommandLine(new SingleArgCommandLine(commandLine)) + .addCommandLine(new SingleArgCommandLine(commandLine)) .addOutput(binaryToLink) .addOutputs(dsymBundleZip.asSet()) .addOutputs(linkmap.asSet()) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java index 20471b3e22..f18f610b43 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java @@ -53,7 +53,7 @@ public class LipoSupport { .addTransitiveInputs(inputBinaries) .addOutput(outputBinary) .setExecutable(CompilationSupport.xcrunwrapper(ruleContext)) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .add(ObjcRuleClasses.LIPO) .addExecPaths("-create", inputBinaries) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java index 5d7bb41683..e13c67c485 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java @@ -457,7 +457,7 @@ final class ProtobufSupport { .addOutputs(getGeneratedProtoOutputs(outputProtos, HEADER_SUFFIX)) .addOutputs(getProtoSourceFilesForCompilation(outputProtos)) .setExecutable(attributes.getProtoCompiler().getExecPath()) - .setCommandLine(getGenerationCommandLine(protoInputsFile)) + .addCommandLine(getGenerationCommandLine(protoInputsFile)) .build(ruleContext)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtocolBuffers2Support.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtocolBuffers2Support.java index 67dd444271..7e13b35921 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtocolBuffers2Support.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtocolBuffers2Support.java @@ -75,7 +75,7 @@ final class ProtocolBuffers2Support { .addOutputs(getGeneratedProtoOutputs(getHeaderExtension())) .addOutputs(getGeneratedProtoOutputs(getSourceExtension())) .setExecutable(PathFragment.create("/usr/bin/python")) - .setCommandLine(getGenerationCommandLine()) + .addCommandLine(getGenerationCommandLine()) .build(ruleContext)); return this; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java index d33cb964e7..648bba234c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java @@ -390,7 +390,7 @@ public final class ReleaseBundlingSupport { .setMnemonic("EnvironmentPlist") .setExecutable(attributes.environmentPlist()) .addOutput(getGeneratedEnvironmentPlist()) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .add("--platform", platformWithVersion) .addExecPath("--output", getGeneratedEnvironmentPlist()) @@ -609,7 +609,7 @@ public final class ReleaseBundlingSupport { .addTransitiveInputs(entitlements) .addOutput(intermediateArtifacts.entitlements()) .addInput(plMergeControlArtifact) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .addExecPath("--control", plMergeControlArtifact) .build()) @@ -861,7 +861,7 @@ public final class ReleaseBundlingSupport { .addInput(bundleMergeControlArtifact) .addTransitiveInputs(bundling.getBundleContentArtifacts()) .addOutput(intermediateArtifacts.unprocessedIpa()) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder().addExecPath(bundleMergeControlArtifact).build()) .build(ruleContext)); } @@ -1048,7 +1048,7 @@ public final class ReleaseBundlingSupport { ObjcRuleClasses.spawnAppleEnvActionBuilder(appleConfiguration, platform) .setMnemonic("SwiftStdlibCopy") .setExecutable(attributes.swiftStdlibToolWrapper()) - .setCommandLine(commandLine.build()) + .addCommandLine(commandLine.build()) .addOutput(intermediateArtifacts.swiftFrameworksFileZip()) .addInput(combinedArchBinary) .build(ruleContext)); @@ -1080,7 +1080,7 @@ public final class ReleaseBundlingSupport { ObjcRuleClasses.spawnAppleEnvActionBuilder(configuration, platform) .setMnemonic("SwiftCopySwiftSupport") .setExecutable(attributes.swiftStdlibToolWrapper()) - .setCommandLine(commandLine.build()) + .addCommandLine(commandLine.build()) .addOutput(intermediateArtifacts.swiftSupportZip()) .addInput(combinedArchBinary) .build(ruleContext)); |