Title: [184778] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184778
- Author
- bshaf...@apple.com
- Date
- 2015-05-22 10:36:34 -0700 (Fri, 22 May 2015)
Log Message
Merged r184773. rdar://problem/20830673
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184777 => 184778)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 17:34:46 UTC (rev 184777)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 17:36:34 UTC (rev 184778)
@@ -1,5 +1,18 @@
2015-05-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r184773.
+
+ 2015-05-22 Dan Bernstein <m...@apple.com>
+
+ Fixed the fix for <rdar://problem/20830673> Symlink the WebKit dylib instead of just the framework directory
+ https://bugs.webkit.org/show_bug.cgi?id=145287
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit2.xcodeproj/project.pbxproj: Give the symlink the correct destination.
+
+2015-05-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r184670.
2015-05-19 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184777 => 184778)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-22 17:34:46 UTC (rev 184777)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-22 17:36:34 UTC (rev 184778)
@@ -9052,7 +9052,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- 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";
+ 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
