<!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>[179162] trunk/Tools</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/179162">179162</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-26 20:06:36 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Remove the various aliases for --ios-simulator (--sim, --simulator, --ios-sim) in
arguments for build and test scripts
https://bugs.webkit.org/show_bug.cgi?id=139748
Patch by Simon Fraser <simon.fraser@apple.com> on 2015-01-26
Reviewed by Daniel Bates.
There was much confusion resulting from the multitude of aliases used to build/test for
the iOS simulator. Standardize on "--ios-simulator", which is also the name of the layout
tests directory.
This fixes an issue where run-api-tests and some other scripts failed when run with
--simulator.
* Scripts/build-webkit:
* Scripts/package-root:
(usage):
* Scripts/webkitdirs.pm:
(argumentsForConfiguration):
(determineXcodeSDK):
* Scripts/webkitpy/port/factory.py:
(platform_options):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptspackageroot">trunk/Tools/Scripts/package-root</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpyportfactorypy">trunk/Tools/Scripts/webkitpy/port/factory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179161 => 179162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-27 02:39:44 UTC (rev 179161)
+++ trunk/Tools/ChangeLog 2015-01-27 04:06:36 UTC (rev 179162)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-01-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Remove the various aliases for --ios-simulator (--sim, --simulator, --ios-sim) in
+ arguments for build and test scripts
+ https://bugs.webkit.org/show_bug.cgi?id=139748
+
+ Reviewed by Daniel Bates.
+
+ There was much confusion resulting from the multitude of aliases used to build/test for
+ the iOS simulator. Standardize on "--ios-simulator", which is also the name of the layout
+ tests directory.
+
+ This fixes an issue where run-api-tests and some other scripts failed when run with
+ --simulator.
+
+ * Scripts/build-webkit:
+ * Scripts/package-root:
+ (usage):
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+ (determineXcodeSDK):
+ * Scripts/webkitpy/port/factory.py:
+ (platform_options):
+
+2015-01-26 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [iOS WK2] Fix possible crash when -[WKWebView evaluateJavaScript:completionHandler:] was called then the WKWebView is destroyed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140203
</span><span class="cx"> rdar://problem/19198492
</span></span></pre></div>
<a id="trunkToolsScriptspackageroot"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/package-root (179161 => 179162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/package-root 2015-01-27 02:39:44 UTC (rev 179161)
+++ trunk/Tools/Scripts/package-root 2015-01-27 04:06:36 UTC (rev 179162)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> --sdk Specifies SDK for which the roots are staged
</span><span class="cx"> (Default: currently installed Base SDK)
</span><span class="cx"> --device Equivalent to --sdk iphoneos.internal
</span><del>- --simulator Equivalent to --sdk iphonesimulator
</del><ins>+ --ios-simulator Equivalent to --sdk iphonesimulator
</ins><span class="cx"> --debug Package roots from Debug-<platform>
</span><span class="cx"> --release Package roots from Release-<platform>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (179161 => 179162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-01-27 02:39:44 UTC (rev 179161)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-01-27 04:06:36 UTC (rev 179162)
</span><span class="lines">@@ -418,7 +418,6 @@
</span><span class="cx"> push(@args, '--debug') if ($configuration =~ "^Debug");
</span><span class="cx"> push(@args, '--release') if ($configuration =~ "^Release");
</span><span class="cx"> push(@args, '--device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
</span><del>- push(@args, '--sim') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
</del><span class="cx"> push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
</span><span class="cx"> push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
</span><span class="cx"> push(@args, '--64-bit') if (isWin64());
</span><span class="lines">@@ -440,9 +439,7 @@
</span><span class="cx"> my $hasInternalSDK = exitStatus(system("xcrun --sdk iphoneos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
</span><span class="cx"> $xcodeSDK ||= $hasInternalSDK ? "iphoneos.internal" : "iphoneos";
</span><span class="cx"> }
</span><del>- if (checkForArgumentAndRemoveFromARGV("--sim") ||
- checkForArgumentAndRemoveFromARGV("--simulator") ||
- checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
</del><ins>+ if (checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
</ins><span class="cx"> $xcodeSDK ||= 'iphonesimulator';
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportfactorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (179161 => 179162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-27 02:39:44 UTC (rev 179161)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-27 04:06:36 UTC (rev 179162)
</span><span class="lines">@@ -44,12 +44,9 @@
</span><span class="cx"> return [
</span><span class="cx"> optparse.make_option('--platform', action='store',
</span><span class="cx"> help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')),
</span><del>- optparse.make_option('--ios-sim', action='store_const', dest='platform',
- const=('ios-simulator'),
- help=('Alias for --platform=ios-sim*' if use_globs else 'Alias for --platform=ios-simulator')),
</del><span class="cx"> optparse.make_option('--ios-simulator', action='store_const', dest='platform',
</span><span class="cx"> const=('ios-simulator'),
</span><del>- help=('Alias for --platform=ios-sim*' if use_globs else 'Alias for --platform=ios-simulator')),
</del><ins>+ help=('Alias for --platform=ios-simulator')),
</ins><span class="cx"> optparse.make_option('--efl', action='store_const', dest='platform',
</span><span class="cx"> const=('efl*' if use_globs else 'efl'),
</span><span class="cx"> help=('Alias for --platform=efl*' if use_globs else 'Alias for --platform=efl')),
</span></span></pre>
</div>
</div>
</body>
</html>