Another build fix.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 23:21:07 +0000 (23:21 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 23:21:07 +0000 (23:21 +0000)
* WebKit.xcodeproj/project.pbxproj:
Remove WK headers from WebKit.framework as well when WebKitLegacy WK headers are encountered.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj

index 7fbdca62c2976facff826edb9f2c6cae8af3d9cc..1faa6802dcfaac2eb1499fe91a96211691a3ab59 100644 (file)
@@ -1,3 +1,10 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        Another build fix.
+
+        * WebKit.xcodeproj/project.pbxproj:
+        Remove WK headers from WebKit.framework as well when WebKitLegacy WK headers are encountered.
+
 2014-04-30  Anders Carlsson  <andersca@apple.com>
 
         Try to fix the build.
index e191ef4ed36e077b1f482e587a3f77f1abfee784..6e0ec5f25b3c6dcd1d961c29872201c9e7ff559c 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n        mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n\n        # FIXME: This is only here to clear out some old cruft, it should be removed after some time.\n        rm \"${BUILT_PRODUCTS_DIR}/WebKitLegacy.framework/PrivateHeaders/\"WK*.h 2> /dev/null\n        rm \"${BUILT_PRODUCTS_DIR}/WebKitLegacy.framework/PrivateHeaders/\"_WK*.h 2> /dev/null\n    fi\n    mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+                       shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n        mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n\n        # FIXME: This is only here to clear out some old cruft, it should be removed after some time.\n        if [ -e \"${BUILT_PRODUCTS_DIR}/WebKitLegacy.framework/PrivateHeaders/WKWebViewPrivate.h\" ]; then\n            rm \"${BUILT_PRODUCTS_DIR}/WebKitLegacy.framework/PrivateHeaders/\"WK*.h 2> /dev/null\n            rm \"${BUILT_PRODUCTS_DIR}/WebKitLegacy.framework/PrivateHeaders/\"_WK*.h 2> /dev/null\n            rm \"${BUILT_PRODUCTS_DIR}/WebKit.framework/PrivateHeaders/\"WK*.h 2> /dev/null\n            rm \"${BUILT_PRODUCTS_DIR}/WebKit.framework/PrivateHeaders/\"_WK*.h 2> /dev/null\n        fi\n    fi\n    mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
                };
                1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
                        isa = PBXShellScriptBuildPhase;