<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168138] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168138">168138</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 17:34:03 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebKitLegacyWebKitm">trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (168137 => 168138)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-01 Anders Carlsson <andersca@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.
+
</ins><span class="cx"> 2014-05-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/16780403> REGRESSION: Plugin tests failing on Mac/WebKit1.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (168137 => 168138)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1988,6 +1988,7 @@
</span><span class="cx"> 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
</span><span class="cx"> 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
</span><span class="cx"> 5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */,
</span><ins>+ 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -2133,6 +2134,20 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> 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";
</span><span class="cx"> };
</span><ins>+ 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";
+ };
</ins><span class="cx"> 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 8;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168137 => 168138)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-01 Anders Carlsson <andersca@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.
+
</ins><span class="cx"> 2014-04-30 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out fix for https://bugs.webkit.org/show_bug.cgi?id=131637:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitLegacyWebKitm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m (168137 => 168138)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,6 +23,22 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
</del><ins>+#import <TargetConditionals.h>
</ins><span class="cx">
</span><del>-// This file is only here so that WebKit.framework has something to link.
</del><ins>+// 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
</ins></span></pre>
</div>
</div>
</body>
</html>