aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/protobuf
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2015-12-11 19:02:17 +0000
committerGravatar David Chen <dzc@google.com>2015-12-13 18:27:34 +0000
commit1373e6681e4b54f271aa3a2c762a915b462d0da7 (patch)
treefd51edad1f2b3a1be44e2e11729a5efe544c773c /src/main/protobuf
parent881913ae3c5d8c587226c0280ab9ef8c0d1a8c83 (diff)
Bundlemerge optionally takes a completed plist to bundle into the archive, instead of multiple plists to merge and variable substitutions to apply.
The new key bundle_info_plist_file, gives the path to the completed plist. If it is defined, the keys source_plist_file and variable_substitution are not used. -- MOS_MIGRATED_REVID=110010012
Diffstat (limited to 'src/main/protobuf')
-rw-r--r--src/main/protobuf/bundlemerge.proto12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/protobuf/bundlemerge.proto b/src/main/protobuf/bundlemerge.proto
index b31bec9852..41a338a093 100644
--- a/src/main/protobuf/bundlemerge.proto
+++ b/src/main/protobuf/bundlemerge.proto
@@ -20,11 +20,19 @@ option java_package = "com.google.devtools.build.xcode.bundlemerge.proto";
// Contains all the arguments necessary to drive the BundleMerge tool,
// including the path to the output file and extra files to include in the
// bundle.
+// Next Id: 17
message Control {
// Paths to the plist files to merge into the final Plist.info file. These
// can be binary, XML, or ASCII format.
+ // This field is deprecated, but is supported for backwards compatibility.
+ // If bundle_info_plist_file is not supplied, this key will be used instead.
repeated string source_plist_file = 1;
+ // The single info.plist file to be bundled into the archive. This plist will
+ // not be modified by bundlemerge.
+ // This field replaces source_plist_file.
+ optional string bundle_info_plist_file = 16;
+
// Path to the .ipa file to write. This is the final application bundle. Note
// this is ignored for nested bundles.
optional string out_file = 2;
@@ -69,6 +77,10 @@ message Control {
// Variable substitutions to perform on property values in the merged
// .plist file.
+ // This field is deprecated, and will not be used if a bundle_info_plist_file
+ // is specified. For backwards compatibility, if a bundle_info_plist_file
+ // is not specified, source_plist_file will be used instead and variable
+ // substitutions will be applied.
repeated VariableSubstitution variable_substitution = 11;
// Bundles that are nested within this one. bundle_root in these bundles is