<!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>[184964] trunk/Source/WebKit2</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/184964">184964</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-28 15:40:02 -0700 (Thu, 28 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure that we create the private WebKit.framework symlinks last
https://bugs.webkit.org/show_bug.cgi?id=145442
&lt;rdar://problem/21142213&gt;

Reviewed by Dan Bernstein.

Move the &quot;Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework&quot; build phase to
the &quot;All&quot; aggregate target. Also update the script now that INSTALL_PATH is different.

* WebKit2.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184963 => 184964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-05-28 22:31:17 UTC (rev 184963)
+++ trunk/Source/WebKit2/ChangeLog        2015-05-28 22:40:02 UTC (rev 184964)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-28  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Make sure that we create the private WebKit.framework symlinks last
+        https://bugs.webkit.org/show_bug.cgi?id=145442
+        &lt;rdar://problem/21142213&gt;
+
+        Reviewed by Dan Bernstein.
+
+        Move the &quot;Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework&quot; build phase to
+        the &quot;All&quot; aggregate target. Also update the script now that INSTALL_PATH is different.
+
+        * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-05-28  Said Abou-Hallawa  &lt;sabouhallawa@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Code clean up for extracting information from the mix of WritingMode and TextDirection
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184963 => 184964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2015-05-28 22:31:17 UTC (rev 184963)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2015-05-28 22:40:02 UTC (rev 184964)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx">                                 1A50DB70110A3D67000D3FE5 /* Copy Files */,
</span><span class="cx">                                 BCFFCA8A160D6DEA003DF315 /* Add current version symlinks */,
</span><span class="cx">                                 BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
</span><ins>+                                1A1A18301B17919B00B06F12 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */,
</ins><span class="cx">                         );
</span><span class="cx">                         dependencies = (
</span><span class="cx">                                 1A6280F619199865006AD9F9 /* PBXTargetDependency */,
</span><span class="lines">@@ -8678,7 +8679,6 @@
</span><span class="cx">                                 5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
</span><span class="cx">                                 5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
</span><span class="cx">                                 A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
</span><del>-                                1A07D2F61919AB1B00ECDA16 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */,
</del><span class="cx">                         );
</span><span class="cx">                         buildRules = (
</span><span class="cx">                         );
</span><span class="lines">@@ -9058,7 +9058,7 @@
</span><span class="cx">                         shellPath = /bin/sh;
</span><span class="cx">                         shellScript = &quot;if [[ ${PLATFORM_NAME} != \&quot;macosx\&quot; ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \&quot;$TARGET_BUILD_DIR/WebKit.framework/Frameworks\&quot;\n&quot;;
</span><span class="cx">                 };
</span><del>-                1A07D2F61919AB1B00ECDA16 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */ = {
</del><ins>+                1A1A18301B17919B00B06F12 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */ = {
</ins><span class="cx">                         isa = PBXShellScriptBuildPhase;
</span><span class="cx">                         buildActionMask = 8;
</span><span class="cx">                         files = (
</span><span class="lines">@@ -9070,7 +9070,7 @@
</span><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 1;
</span><span class="cx">                         shellPath = /bin/sh;
</span><del>-                        shellScript = &quot;if [[ ${PLATFORM_NAME} != \&quot;iphoneos\&quot; ]]; then\n    exit 0;\nfi\n\nif [[ ! -d \&quot;${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\&quot; ]]; then\n    mkdir -p \&quot;${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\&quot;\nfi\n\ncd ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nln -s -h -f ../../Frameworks/WebKit.framework/* .&quot;;
</del><ins>+                        shellScript = &quot;if [[ ${PLATFORM_NAME} != \&quot;iphoneos\&quot; ]]; then\nexit 0;\nfi\n\nif [[ ! -d \&quot;${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\&quot; ]]; then\nmkdir -p \&quot;${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\&quot;\nfi\n\ncd ${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\nln -s -h -f ../../Frameworks/WebKit.framework/* .&quot;;
</ins><span class="cx">                 };
</span><span class="cx">                 1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
</span><span class="cx">                         isa = PBXShellScriptBuildPhase;
</span></span></pre>
</div>
</div>

</body>
</html>