<!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>[213577] 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/213577">213577</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-08 09:50:36 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/213545">r213545</a>.
iOS EWS broken by this change
Reverted changeset:
"Standardize device/simulator naming conventions"
https://bugs.webkit.org/show_bug.cgi?id=169083
http://trac.webkit.org/changeset/213545</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptspackageroot">trunk/Tools/Scripts/package-root</a></li>
<li><a href="#trunkToolsScriptsrunapitests">trunk/Tools/Scripts/run-api-tests</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigewsjson">trunk/Tools/Scripts/webkitpy/common/config/ews.json</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportfactorypy">trunk/Tools/Scripts/webkitpy/port/factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportios_devicepy">trunk/Tools/Scripts/webkitpy/port/ios_device.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/ChangeLog 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-08 Jonathan Bedard <jbedard@apple.com>
+
+ Unreviewed, rolling out r213545.
+
+ iOS EWS broken by this change
+
+ Reverted changeset:
+
+ "Standardize device/simulator naming conventions"
+ https://bugs.webkit.org/show_bug.cgi?id=169083
+ http://trac.webkit.org/changeset/213545
+
</ins><span class="cx"> 2017-03-07 Kocsen Chung <kocsen_chung@apple.com>
</span><span class="cx">
</span><span class="cx"> Perf and layout test results should report using correct scm revision.
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/build-webkit 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -92,10 +92,8 @@
</span><span class="cx"> --debug Compile with Debug configuration
</span><span class="cx"> --release Compile with Release configuration
</span><span class="cx"> --sdk=<sdk> Use a specific Xcode SDK (iOS and Mac only)
</span><del>- --ios-device Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
- --device DEPRECATED alias of --ios-device
</del><ins>+ --device Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
</ins><span class="cx"> --ios-simulator Use the current iphonesimulator SDK (iOS only)
</span><del>- --simulator DEPRECATED alias of --ios-simulator
</del><span class="cx"> --coverage Enable code coverage support (Mac only)
</span><span class="cx"> --analyze Enable static anaylsis (iOS and Mac only)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptspackageroot"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/package-root (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/package-root 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/package-root 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -46,10 +46,8 @@
</span><span class="cx"> --help Show this help message
</span><span class="cx"> --sdk Specifies SDK for which the roots are staged
</span><span class="cx"> (Default: currently installed Base SDK)
</span><del>- --ios-device Equivalent to --sdk iphoneos.internal
- --device DEPRECATED alias of --ios-device
</del><ins>+ --device Equivalent to --sdk iphoneos.internal
</ins><span class="cx"> --ios-simulator Equivalent to --sdk iphonesimulator
</span><del>- --simulator DEPRECATED alias of --ios-simulator
</del><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="trunkToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-api-tests (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-api-tests 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/run-api-tests 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> Platform options:
</span><span class="cx"> --ios-simulator Run tests in the iOS Simulator
</span><del>- --simulator DEPRECATED alias of --ios-simulator
</del><span class="cx">
</span><span class="cx"> @{[ sharedCommandLineOptionsUsage(indent => 2, switchWidth => 21) ]}
</span><span class="cx"> Examples
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> # These are determined automatically from stored configuration.
</span><span class="cx"> push(@args, '--debug') if ($configuration =~ "^Debug");
</span><span class="cx"> push(@args, '--release') if ($configuration =~ "^Release");
</span><del>- push(@args, '--ios-device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
</del><ins>+ push(@args, '--device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
</ins><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">@@ -457,11 +457,11 @@
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) {
</span><span class="cx"> $xcodeSDK = $sdk;
</span><span class="cx"> }
</span><del>- if (checkForArgumentAndRemoveFromARGV("--device") || checkForArgumentAndRemoveFromARGV("--ios-device")) {
</del><ins>+ if (checkForArgumentAndRemoveFromARGV("--device")) {
</ins><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("--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="trunkToolsScriptswebkitpycommonconfigewsjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> "iOS EWS": {
</span><del>- "port": "ios-device",
</del><ins>+ "port": "ios",
</ins><span class="cx"> "architecture": "armv7s"
</span><span class="cx"> },
</span><span class="cx"> "iOS Simulator EWS": {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx"> def port(port_name):
</span><span class="cx"> ports = {
</span><span class="cx"> "gtk-wk2": GtkWK2Port,
</span><del>- "ios-device": IOSPort,
- # FIXME: https://bugs.webkit.org/show_bug.cgi?id=169302
</del><span class="cx"> "ios": IOSPort,
</span><span class="cx"> "ios-simulator-wk2": IOSSimulatorWK2Port,
</span><span class="cx"> "mac": MacPort,
</span><span class="lines">@@ -132,7 +130,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class IOSPort(DeprecatedPort):
</span><del>- port_flag_name = "ios-device"
</del><ins>+ port_flag_name = "ios"
</ins><span class="cx">
</span><span class="cx"> def build_webkit_command(self, build_style=None):
</span><span class="cx"> command = super(IOSPort, self).build_webkit_command(build_style=build_style)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportfactorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/factory.py 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -47,9 +47,6 @@
</span><span class="cx"> optparse.make_option('--ios-simulator', action='store_const', dest='platform',
</span><span class="cx"> const=('ios-simulator'),
</span><span class="cx"> help=('Alias for --platform=ios-simulator')),
</span><del>- optparse.make_option('--simulator', action='store_const', dest='platform',
- const=('ios-simulator'),
- help=('DEPRECATED alias for --platform=ios-simulator')),
</del><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 class="lines">@@ -83,7 +80,12 @@
</span><span class="cx"> class PortFactory(object):
</span><span class="cx"> # Order matters. For port classes that have a port_name with a
</span><span class="cx"> # common prefix, the more specific port class should be listed
</span><del>- # first.
</del><ins>+ # first. For example, 'ios_simulator.IOSSimulatorPort' (port_name='ios-simulator')
+ # should be listed before 'ios_device.IOSDevicePort' (port_name='ios'). If this
+ # rule is not followed, then `webkit-patch --ios-simulator` will try
+ # to use IOSDevicePort instead of IOSSimulatorPort because 'ios'
+ # (IOSDevicePort.port_name) is a prefix of 'ios-simulator' (port_name
+ # derived from '--ios-simulator' command-line switch), for example.
</ins><span class="cx"> PORT_CLASSES = (
</span><span class="cx"> 'efl.EflPort',
</span><span class="cx"> 'gtk.GtkPort',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportios_devicepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios_device.py (213576 => 213577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios_device.py 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device.py 2017-03-08 17:50:36 UTC (rev 213577)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class IOSDevicePort(IOSPort):
</span><del>- port_name = 'ios-device'
</del><ins>+ port_name = 'ios'
</ins><span class="cx">
</span><span class="cx"> ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
</span><span class="cx"> DEFAULT_ARCHITECTURE = 'arm64'
</span><span class="lines">@@ -49,4 +49,4 @@
</span><span class="cx"> return ['--sdk', 'iphoneos'] + (['ARCHS=%s' % self.architecture()] if self.architecture() else [])
</span><span class="cx">
</span><span class="cx"> def operating_system(self):
</span><del>- return 'ios-device'
</del><ins>+ return 'ios'
</ins></span></pre>
</div>
</div>
</body>
</html>