Title: [180645] trunk/Source/WebKit
- Revision
- 180645
- Author
- [email protected]
- Date
- 2015-02-25 15:42:38 -0800 (Wed, 25 Feb 2015)
Log Message
<rdar://problem/19949665> Some queues fail to build because of WebKitPluginHost.app symlink
Fix by Dan Bernstein, reviewed by me.
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (180644 => 180645)
--- trunk/Source/WebKit/ChangeLog 2015-02-25 23:19:17 UTC (rev 180644)
+++ trunk/Source/WebKit/ChangeLog 2015-02-25 23:42:38 UTC (rev 180645)
@@ -1,3 +1,11 @@
+2015-02-25 Alexey Proskuryakov <[email protected]>
+
+ <rdar://problem/19949665> Some queues fail to build because of WebKitPluginHost.app symlink
+
+ Fix by Dan Bernstein, reviewed by me.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2015-02-24 Brent Fulgham <[email protected]>
Unreviewed Windows build fix after r180601.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (180644 => 180645)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-02-25 23:19:17 UTC (rev 180644)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-02-25 23:42:38 UTC (rev 180645)
@@ -2079,7 +2079,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n exit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app and WebKitPluginAgent lived at the top level of the framework. Replace any stale copies with symlinks to the new location at Versions/Current.\nrm -rf \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\nln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" ]]; then\n # FIXME: This should be removed once faulty links have been removed on the bots.\n if [[ -L \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPlugin
Host.app\" ]]; then\n rm \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n fi\n\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n fi\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n exit 0\nfi\n\nln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" && ! -e \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"$
{TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n fi\nfi\n";
};
1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
