commit 99966793f57bacb89224e01242eed3f66d92ee52
author Googler <noreply@google.com> Tue Jul 28 20:28:23 2015 +0000
committer Lukacs Berki <lberki@google.com> Wed Jul 29 16:00:52 2015 +0000
tree 3813db5bdc3343d6a3ce1b2db8629ec99093b19f
parent a39f8a9f8ce1fc3c2fcc7a75ba3d7ddab52266ce

Hardcode bad values for plists temporarily while we fix other bugs.

RELNOTES:

--
MOS_MIGRATED_REVID=99309514

src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java

diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
index ca385f3..f9f20bf 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
@@ -165,6 +165,15 @@
     result.put("CFBundleSupportedPlatforms", new NSArray(NSObject.wrap(platform.getNameInPlist())));
     result.put("MinimumOSVersion", NSObject.wrap(minimumOsVersion));
 
+    // Adding these here by brute force to override values inserted by
+    // release bundling support which are wrong.
+    // These shall be removed once the errors in release bundling support are fixed.
+    // These values are taken from an Xcode 6.2 device build.
+    // Adding them to a simulator build causes no problems when tested with Xcode 6.2.
+    result.put("DTPlatformBuild", NSObject.wrap("12D508"));
+    result.put("DTSDKBuild", NSObject.wrap("12D508"));
+    result.put("DTXcode", NSObject.wrap("0620"));
+    result.put("DTXcodeBuild", NSObject.wrap("6C131e"));
     return result.build();
   }
 
@@ -177,7 +186,13 @@
           throws IOException {
     NSDictionary merged = PlistMerging.merge(sourceFiles);
 
-    Set<String> conflictingEntries = Sets.intersection(automaticEntries.keySet(), merged.keySet());
+    // Remove the entries that we have added by brute force in automaticEntries so that our
+    // check for conflictingEntries still works.
+    // This shall be removed once the errors in release bundling support are fixed.
+    Set<String> conflictingEntries = Sets.difference(
+        Sets.intersection(automaticEntries.keySet(), merged.keySet()),
+        ImmutableSet.of("DTPlatformBuild", "DTSDKBuild", "DTXcode", "DTXcodeBuild"));
+
     Preconditions.checkArgument(conflictingEntries.isEmpty(),
         "The following plist entries are generated automatically, but are present in more than one "
             + "of the input lists: %s", conflictingEntries);