Title: [172812] trunk/Source/WebKit
- Revision
- 172812
- Author
- [email protected]
- Date
- 2014-08-20 14:43:33 -0700 (Wed, 20 Aug 2014)
Log Message
<https://webkit.org/b/136119> WebKit1 plug-in test failures in production builds after r172595
Reviewed by Alexey Proskuryakov.
* WebKit.xcodeproj/project.pbxproj: Add the symlinks at the top level of WebKitLegacy.framework
even in Production builds. Add the symlinks in the right locations too.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (172811 => 172812)
--- trunk/Source/WebKit/ChangeLog 2014-08-20 21:07:36 UTC (rev 172811)
+++ trunk/Source/WebKit/ChangeLog 2014-08-20 21:43:33 UTC (rev 172812)
@@ -1,3 +1,12 @@
+2014-08-20 Mark Rowe <[email protected]>
+
+ <https://webkit.org/b/136119> WebKit1 plug-in test failures in production builds after r172595
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKit.xcodeproj/project.pbxproj: Add the symlinks at the top level of WebKitLegacy.framework
+ even in Production builds. Add the symlinks in the right locations too.
+
2014-08-15 Andy Estes <[email protected]>
[Cocoa] Add migrate-headers.sh and postprocess-headers.sh to WebKit.xcodeproj
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172811 => 172812)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-20 21:07:36 UTC (rev 172811)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-08-20 21:43:33 UTC (rev 172812)
@@ -2011,11 +2011,11 @@
);
name = "Symlink WebKitPluginHost";
outputPaths = (
- "$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app",
+ "$(TARGET_BUILD_DIR)/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- 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";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; 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/WebKitPluginHost.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/Frameworks/WebKitLegacy.framework/Versions/A/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
