Title: [171146] trunk/Source/WebKit2
- Revision
- 171146
- Author
- m...@apple.com
- Date
- 2014-07-16 09:33:04 -0700 (Wed, 16 Jul 2014)
Log Message
REGRESSION (r170653): Web Content service’s Info.plist has wrong format
https://bugs.webkit.org/show_bug.cgi?id=134973
Reviewed by Alexey Proskuryakov.
* WebKit2.xcodeproj/project.pbxproj: Updated the Add CFBundle Localization Info.plist Key
script build phases to convert Info.plist back to binary format if the
PLIST_FILE_OUTPUT_FORMAT build setting requires it.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171145 => 171146)
--- trunk/Source/WebKit2/ChangeLog 2014-07-16 15:38:55 UTC (rev 171145)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-16 16:33:04 UTC (rev 171146)
@@ -1,3 +1,14 @@
+2014-07-16 Dan Bernstein <m...@apple.com>
+
+ REGRESSION (r170653): Web Content service’s Info.plist has wrong format
+ https://bugs.webkit.org/show_bug.cgi?id=134973
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKit2.xcodeproj/project.pbxproj: Updated the Add CFBundle Localization Info.plist Key
+ script build phases to convert Info.plist back to binary format if the
+ PLIST_FILE_OUTPUT_FORMAT build setting requires it.
+
2014-07-15 Benjamin Poulain <bpoul...@apple.com>
Fix r171124
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (171145 => 171146)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-16 15:38:55 UTC (rev 171145)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-16 16:33:04 UTC (rev 171146)
@@ -8639,8 +8639,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n echo \"Done\"\nfi\n";
- showEnvVarsInLog = 0;
+ shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n if [[ ${PLIST_FILE_OUTPUT_FORMAT} == \"binary\" ]]; then\n plutil -convert binary1 \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\" || exit $?\n fi\n echo \"Done\"\nfi\n";
};
E19C7DDB194A5E9100F1866F /* Add CFBundle Localization Info.plist Key */ = {
isa = PBXShellScriptBuildPhase;
@@ -8654,8 +8653,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n echo \"Done\"\nfi\n";
- showEnvVarsInLog = 0;
+ shellScript = "/usr/libexec/PlistBuddy -c \"Print :$BUNDLE_LOCALIZATION_KEY\" $TARGET_BUILD_DIR/$INFOPLIST_PATH >/dev/null 2>/dev/null\nif [[ $? != 0 ]]; then\n echo \"Updating the Info.plist key\"\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleAllowMixedLocalizations\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Delete :CFBundleFollowParentLocalization\" $TARGET_BUILD_DIR/$INFOPLIST_PATH 2>/dev/null\n /usr/libexec/PlistBuddy -c \"Add :$BUNDLE_LOCALIZATION_KEY bool true\" $TARGET_BUILD_DIR/$INFOPLIST_PATH\n if [[ ${PLIST_FILE_OUTPUT_FORMAT} == \"binary\" ]]; then\n plutil -convert binary1 \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\" || exit $?\n fi\n echo \"Done\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
