Changeset 171146 in webkit

Timestamp:

Jul 16, 2014 9:33:04 AM (10 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebKit2.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-16  Dan Bernstein  <mitz@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  <bpoulain@apple.com>
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -8640 +8640 @@
                         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 */ = {
@@ -8655 +8654 @@
                         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 */