diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2015-10-29 18:28:11 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-10-30 09:47:32 +0000 |
| commit | 81ee44275de44599bd1b0c8b5a7054b05da58cdb (patch) | |
| tree | d4411b071beb1db0e066575db0fe78066f75c0f7 /src/main | |
| parent | 1d4a362eb1a03f150d3c431cdc1e2894899ee39a (diff) | |
Use plutil instead of plmerge for converting strings files from text to binary.
--
MOS_MIGRATED_REVID=106613927
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java | 12 |
1 files changed, 8 insertions, 4 deletions
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 cad27e149f..50a387c9b7 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 @@ -18,6 +18,7 @@ import static com.google.devtools.build.lib.rules.objc.ObjcProvider.ASSET_CATALO import static com.google.devtools.build.lib.rules.objc.ObjcProvider.BUNDLE_FILE; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.STRINGS; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.XCASSETS_DIR; +import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.XCRUN; import com.google.common.base.Optional; import com.google.common.base.Verify; @@ -312,12 +313,15 @@ final class BundleSupport { ObjcRuleClasses.intermediateArtifacts(ruleContext); for (Artifact strings : objcProvider.get(ObjcProvider.STRINGS)) { Artifact bundled = intermediateArtifacts.convertedStringsFile(strings); - ruleContext.registerAction(new SpawnAction.Builder() + ruleContext.registerAction(ObjcRuleClasses.spawnOnDarwinActionBuilder(ruleContext) .setMnemonic("ConvertStringsPlist") - .setExecutable(attributes.plmerge()) + .setExecutable(XCRUN) .setCommandLine(CustomCommandLine.builder() - .addExecPath("--source_file", strings) - .addExecPath("--out_file", bundled) + .add("plutil") + .add("-convert").add("binary1") + .addExecPath("-o", bundled) + .add("--") + .addPath(strings.getExecPath()) .build()) .addInput(strings) .addOutput(bundled) |