Title: [172627] trunk/Source/WebKit
- Revision
- 172627
- Author
- [email protected]
- Date
- 2014-08-15 09:49:37 -0700 (Fri, 15 Aug 2014)
Log Message
<https://webkit.org/b/135979> WebKit1 Plug-in test failures in clean builds after r172595
Reviewed by Dan Bernstein.
* WebKit.xcodeproj/project.pbxproj: Add a WebKitPluginHost.app symlink at the top level of
WebKitLegacy.framework that points into Versions/Current. This enables -[NSBundle pathForAuxiliaryExecutable:]
to work correctly. Adding this symlink requires deleting any content that may already exist
at that path, since prior to r172595 it may have contained either a symlink or an
application bundle.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (172626 => 172627)
--- trunk/Source/WebKit/ChangeLog 2014-08-15 16:38:35 UTC (rev 172626)
+++ trunk/Source/WebKit/ChangeLog 2014-08-15 16:49:37 UTC (rev 172627)
@@ -1,3 +1,15 @@
+2014-08-15 Mark Rowe <[email protected]>
+
+ <https://webkit.org/b/135979> WebKit1 Plug-in test failures in clean builds after r172595
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj: Add a WebKitPluginHost.app symlink at the top level of
+ WebKitLegacy.framework that points into Versions/Current. This enables -[NSBundle pathForAuxiliaryExecutable:]
+ to work correctly. Adding this symlink requires deleting any content that may already exist
+ at that path, since prior to r172595 it may have contained either a symlink or an
+ application bundle.
+
2014-08-13 Mark Rowe <[email protected]>
<https://webkit.org/b/135909> Move helper applications out of the root of the framework.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172626 => 172627)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-15 16:38:35 UTC (rev 172626)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-15 16:49:37 UTC (rev 172627)
@@ -2011,7 +2011,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\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 \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n rm \"${CONFIGURATION_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 \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n fi\nfi\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" || ${ACTION} != \"build\" ]]; then\n exit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app lived at the top level of the framework. Replace any stale copy with a symlink to the new location at Versions/Current.\nrm -rf \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n # FIXME: This should be removed once faulty links have been removed on the bots.\n if [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n rm \"${CONFIGURATION_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 \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${CONFIGURATION_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
