Changeset 186226 in webkit

Timestamp:

Jul 2, 2015 9:04:01 AM (9 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/21429613> [iOS] Stop making symlinks from PrivateFrameworks to Frameworks
​https://bugs.webkit.org/show_bug.cgi?id=146542

Reviewed by Sam Weinig.

Source/JavaScriptCore:

• JavaScriptCore.xcodeproj/project.pbxproj: Removed the build phase that makes the symlink.

Source/WebKit2:

• WebKit2.xcodeproj/project.pbxproj: Removed the build phase that makes the directory of

symlinks.

Location:

trunk/Source

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-07-02  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/21429613> [iOS] Stop making symlinks from PrivateFrameworks to Frameworks
+        https://bugs.webkit.org/show_bug.cgi?id=146542
+
+        Reviewed by Sam Weinig.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Removed the build phase that makes the symlink.
+
 2015-07-01  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -6659 +6659 @@
                                 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */,
                                 A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */,
-                                1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */,
                         );
                         buildRules = (
@@ -6773 +6772 @@
                         shellPath = /bin/sh;
                         shellScript = "set -e\n\nif [[ $ENABLE_FTL_JIT != \"ENABLE_FTL_JIT\" ]]\nthen\n    exit 0\nfi\n\nif [[ ${CONFIGURATION:=Debug} != \"Production\" ]]\nthen\n    # Copy the llvmForJSC library into the framework.\n    ditto \"${BUILT_PRODUCTS_DIR}/libllvmForJSC.dylib\" \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libllvmForJSC.dylib\"\nfi\n\nif [[ $PLATFORM_NAME != \"macosx\" ]]\nthen\n    exit 0\nfi\n\nif [ ! -e \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\" ]\nthen\n    ln -fs \"Versions/Current/Libraries\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\"\nfi";
-                };
-                1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
-                        isa = PBXShellScriptBuildPhase;
-                        buildActionMask = 8;
-                        files = (
-                        );
-                        inputPaths = (
-                        );
-                        name = "Add Symlink in /System/Library/PrivateFrameworks";
-                        outputPaths = (
-                        );
-                        runOnlyForDeploymentPostprocessing = 1;
-                        shellPath = /bin/sh;
-                        shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n    exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"";
                 };
                 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-02  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/21429613> [iOS] Stop making symlinks from PrivateFrameworks to Frameworks
+        https://bugs.webkit.org/show_bug.cgi?id=146542
+
+        Reviewed by Sam Weinig.
+
+        * WebKit2.xcodeproj/project.pbxproj: Removed the build phase that makes the directory of
+        symlinks.
+
 2015-07-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -15 +15 @@
                                 BCFFCA8A160D6DEA003DF315 /* Add current version symlinks */,
                                 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
-                                1A1A18301B17919B00B06F12 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */,
                         );
                         dependencies = (
@@ -8908 +8907 @@
                         shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
                 };
-                1A1A18301B17919B00B06F12 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */ = {
-                        isa = PBXShellScriptBuildPhase;
-                        buildActionMask = 8;
-                        files = (
-                        );
-                        inputPaths = (
-                        );
-                        name = "Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework";
-                        outputPaths = (
-                        );
-                        runOnlyForDeploymentPostprocessing = 1;
-                        shellPath = /bin/sh;
-                        shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\nexit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\" ]]; then\nmkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\"\nfi\n\ncd ${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\nln -s -h -f ../../Frameworks/WebKit.framework/* .";
-                };
                 1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
                         isa = PBXShellScriptBuildPhase;