Title: [184757] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184757
- Author
- bshaf...@apple.com
- Date
- 2015-05-21 23:35:05 -0700 (Thu, 21 May 2015)
Log Message
Merged r184738. rdar://problem/20830673
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184756 => 184757)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:34:17 UTC (rev 184756)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:35:05 UTC (rev 184757)
@@ -1,5 +1,19 @@
2015-05-21 Babak Shafiei <bshaf...@apple.com>
+ Merge r184738.
+
+ 2015-05-21 Anders Carlsson <ander...@apple.com>
+
+ Symlink the WebKit dylib instead of just the framework directory
+ https://bugs.webkit.org/show_bug.cgi?id=145287
+ rdar://problem/20830673
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2015-05-21 Babak Shafiei <bshaf...@apple.com>
+
Merge r184726.
2015-05-21 Brian Weinstein <bweinst...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184756 => 184757)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-22 06:34:17 UTC (rev 184756)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-22 06:35:05 UTC (rev 184757)
@@ -9042,7 +9042,7 @@
};
1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
+ buildActionMask = 8;
files = (
);
inputPaths = (
@@ -9050,9 +9050,9 @@
name = "Add Symlink in /System/Library/PrivateFrameworks";
outputPaths = (
);
- runOnlyForDeploymentPostprocessing = 0;
+ runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\n\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n echo \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\n exit 1\nfi\n\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework";
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\"\nfi\n\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework/WebKit ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework/WebKit";
};
1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
