Title: [168138] trunk/Source/WebKit
- Revision
- 168138
- Author
- ander...@apple.com
- Date
- 2014-05-01 17:34:03 -0700 (Thu, 01 May 2014)
Log Message
Support OS-version-specific install paths for WebKit.framework
https://bugs.webkit.org/show_bug.cgi?id=132448
<rdar://problem/16784932>
Reviewed by Dan Bernstein.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Add a build step to put a symlink in place from PrivateFrameworks to Frameworks.
Source/WebKit/mac:
* WebKitLegacy/WebKit.m:
Add version specific install names.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (168137 => 168138)
--- trunk/Source/WebKit/ChangeLog 2014-05-02 00:04:19 UTC (rev 168137)
+++ trunk/Source/WebKit/ChangeLog 2014-05-02 00:34:03 UTC (rev 168138)
@@ -1,3 +1,14 @@
+2014-05-01 Anders Carlsson <ander...@apple.com>
+
+ Support OS-version-specific install paths for WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132448
+ <rdar://problem/16784932>
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Add a build step to put a symlink in place from PrivateFrameworks to Frameworks.
+
2014-05-01 Dan Bernstein <m...@apple.com>
<rdar://problem/16780403> REGRESSION: Plugin tests failing on Mac/WebKit1.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (168137 => 168138)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-02 00:04:19 UTC (rev 168137)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-02 00:34:03 UTC (rev 168138)
@@ -1988,6 +1988,7 @@
1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */,
+ 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */,
);
buildRules = (
);
@@ -2133,6 +2134,20 @@
shellPath = /bin/sh;
shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n";
};
+ 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n if [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\n fi\n if [[ -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\n fi\n # If the symlink already exists, remove it and create the new one in its place.\n ln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
+ };
1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
Modified: trunk/Source/WebKit/mac/ChangeLog (168137 => 168138)
--- trunk/Source/WebKit/mac/ChangeLog 2014-05-02 00:04:19 UTC (rev 168137)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-02 00:34:03 UTC (rev 168138)
@@ -1,3 +1,14 @@
+2014-05-01 Anders Carlsson <ander...@apple.com>
+
+ Support OS-version-specific install paths for WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132448
+ <rdar://problem/16784932>
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitLegacy/WebKit.m:
+ Add version specific install names.
+
2014-04-30 Alexey Proskuryakov <a...@apple.com>
Roll out fix for https://bugs.webkit.org/show_bug.cgi?id=131637:
Modified: trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m (168137 => 168138)
--- trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m 2014-05-02 00:04:19 UTC (rev 168137)
+++ trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m 2014-05-02 00:34:03 UTC (rev 168138)
@@ -23,6 +23,22 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-// FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
+#import <TargetConditionals.h>
-// This file is only here so that WebKit.framework has something to link.
+// FIXME: This file is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
+
+#if TARGET_OS_IPHONE
+
+#define DEFINE_INSTALL_NAME(major, minor) \
+ extern __attribute__((visibility ("default"))) const char install_name_ ##major## _ ##minor __asm("$ld$install_name$os" #major "." #minor "$/System/Library/PrivateFrameworks/WebKit.framework/WebKit"); \
+ const char install_name_ ##major## _ ##minor = 0;
+
+DEFINE_INSTALL_NAME(4, 3);
+DEFINE_INSTALL_NAME(5, 0);
+DEFINE_INSTALL_NAME(5, 1);
+DEFINE_INSTALL_NAME(6, 0);
+DEFINE_INSTALL_NAME(6, 1);
+DEFINE_INSTALL_NAME(7, 0);
+DEFINE_INSTALL_NAME(7, 1);
+
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
