<!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>[172627] 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/172627">172627</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-08-15 09:49:37 -0700 (Fri, 15 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/135979> WebKit1 Plug-in test failures in clean builds after <a href="http://trac.webkit.org/projects/webkit/changeset/172595">r172595</a>
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 <a href="http://trac.webkit.org/projects/webkit/changeset/172595">r172595</a> it may have contained either a symlink or an
application bundle.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (172626 => 172627)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-15 Mark Rowe <mrowe@apple.com>
+
+ <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.
+
</ins><span class="cx"> 2014-08-13 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/135909> Move helper applications out of the root of the framework.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (172626 => 172627)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2011,7 +2011,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre>
</div>
</div>
</body>
</html>