<!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>[213654] 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/213654">213654</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-09 11:46:19 -0800 (Thu, 09 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Standardize device/simulator naming conventions
https://bugs.webkit.org/show_bug.cgi?id=169083
&lt;rdar://problem/30810466&gt;

Reviewed by Alexey Proskuryakov.

* Scripts/build-webkit: Document --ios-device and --simulator options.
* Scripts/package-root:
(usage): Ditto.
* Scripts/run-api-tests: Document --simulator option.
* Scripts/webkitdirs.pm:
(argumentsForConfiguration): Use --ios-device by default rather than --device.
(determineXcodeSDK): Parse --ios-device and --simulator options.
* Scripts/webkitpy/common/config/ews.json: Change port name from ios to ios-device.
* Scripts/webkitpy/common/config/ports.py: Ditto.
(DeprecatedPort.port):
(IOSPort): Change port name from ios to ios-device.
* Scripts/webkitpy/port/factory.py:
(platform_options): Add --simulator option.
(PortFactory): Update comment.
* Scripts/webkitpy/port/ios_device.py:
(IOSDevicePort): Change port name from ios to ios-device.
(IOSDevicePort.operating_system): Ditto.</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 (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/ChangeLog        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2017-03-09  Jonathan Bedard  &lt;jbedard@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Standardize device/simulator naming conventions
+        https://bugs.webkit.org/show_bug.cgi?id=169083
+        &lt;rdar://problem/30810466&gt;
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/build-webkit: Document --ios-device and --simulator options.
+        * Scripts/package-root:
+        (usage): Ditto.
+        * Scripts/run-api-tests: Document --simulator option.
+        * Scripts/webkitdirs.pm:
+        (argumentsForConfiguration): Use --ios-device by default rather than --device.
+        (determineXcodeSDK): Parse --ios-device and --simulator options.
+        * Scripts/webkitpy/common/config/ews.json: Change port name from ios to ios-device.
+        * Scripts/webkitpy/common/config/ports.py: Ditto.
+        (DeprecatedPort.port):
+        (IOSPort): Change port name from ios to ios-device. 
+        * Scripts/webkitpy/port/factory.py:
+        (platform_options): Add --simulator option.
+        (PortFactory): Update comment.
+        * Scripts/webkitpy/port/ios_device.py:
+        (IOSDevicePort): Change port name from ios to ios-device.
+        (IOSDevicePort.operating_system): Ditto.
+
+2017-03-09  Jonathan Bedard  &lt;jbedard@apple.com&gt;
+
</ins><span class="cx">         webkitpy: Add unit test to prevent breakage of EWS
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=169385
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/build-webkit        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -92,8 +92,10 @@
</span><span class="cx">   --debug                           Compile with Debug configuration
</span><span class="cx">   --release                         Compile with Release configuration
</span><span class="cx">   --sdk=&lt;sdk&gt;                       Use a specific Xcode SDK (iOS and Mac only)
</span><del>-  --device                          Use &quot;iphoneos.internal&quot; SDK if installed, else &quot;iphoneos&quot; SDK (iOS only)
</del><ins>+  --ios-device                      Use &quot;iphoneos.internal&quot; SDK if installed, else &quot;iphoneos&quot; SDK (iOS only)
+  --device                          DEPRECATED alias of --ios-device
</ins><span class="cx">   --ios-simulator                   Use the current iphonesimulator SDK (iOS only)
</span><ins>+  --simulator                       DEPRECATED alias of --ios-simulator
</ins><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 (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/package-root        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/package-root        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -46,8 +46,10 @@
</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>-      --device                          Equivalent to --sdk iphoneos.internal
</del><ins>+      --ios-device                      Equivalent to --sdk iphoneos.internal
+      --device                          DEPRECATED alias of --ios-device
</ins><span class="cx">       --ios-simulator                   Equivalent to --sdk iphonesimulator
</span><ins>+      --simulator                       DEPRECATED alias of --ios-simulator
</ins><span class="cx">       --debug                           Package roots from Debug-&lt;platform&gt;
</span><span class="cx">       --release                         Package roots from Release-&lt;platform&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-api-tests (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-api-tests        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/run-api-tests        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> 
</span><span class="cx"> Platform options:
</span><span class="cx">   --ios-simulator       Run tests in the iOS Simulator
</span><ins>+  --simulator           DEPRECATED alias of --ios-simulator
</ins><span class="cx"> 
</span><span class="cx"> @{[ sharedCommandLineOptionsUsage(indent =&gt; 2, switchWidth =&gt; 21) ]}
</span><span class="cx"> Examples
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/webkitdirs.pm        2017-03-09 19:46:19 UTC (rev 213654)
</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 =~ &quot;^Debug&quot;);
</span><span class="cx">     push(@args, '--release') if ($configuration =~ &quot;^Release&quot;);
</span><del>-    push(@args, '--device') if (defined $xcodeSDK &amp;&amp; $xcodeSDK =~ /^iphoneos/);
</del><ins>+    push(@args, '--ios-device') if (defined $xcodeSDK &amp;&amp; $xcodeSDK =~ /^iphoneos/);
</ins><span class="cx">     push(@args, '--ios-simulator') if (defined $xcodeSDK &amp;&amp; $xcodeSDK =~ /^iphonesimulator/);
</span><span class="cx">     push(@args, '--32-bit') if ($architecture ne &quot;x86_64&quot; 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(&quot;--sdk&quot;, \$sdk)) {
</span><span class="cx">         $xcodeSDK = $sdk;
</span><span class="cx">     }
</span><del>-    if (checkForArgumentAndRemoveFromARGV(&quot;--device&quot;)) {
</del><ins>+    if (checkForArgumentAndRemoveFromARGV(&quot;--device&quot;) || checkForArgumentAndRemoveFromARGV(&quot;--ios-device&quot;)) {
</ins><span class="cx">         my $hasInternalSDK = exitStatus(system(&quot;xcrun --sdk iphoneos.internal --show-sdk-version &gt; /dev/null 2&gt;&amp;1&quot;)) == 0;
</span><span class="cx">         $xcodeSDK ||= $hasInternalSDK ? &quot;iphoneos.internal&quot; : &quot;iphoneos&quot;;
</span><span class="cx">     }
</span><del>-    if (checkForArgumentAndRemoveFromARGV(&quot;--ios-simulator&quot;)) {
</del><ins>+    if (checkForArgumentAndRemoveFromARGV(&quot;--simulator&quot;) || checkForArgumentAndRemoveFromARGV(&quot;--ios-simulator&quot;)) {
</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 (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ews.json        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -12,7 +12,8 @@
</span><span class="cx">         ]
</span><span class="cx">     },
</span><span class="cx">     &quot;iOS EWS&quot;: {
</span><del>-        &quot;port&quot;: &quot;ios&quot;,
</del><ins>+        &quot;port&quot;: &quot;ios-device&quot;,
+        &quot;name&quot;: &quot;ios-ews&quot;,
</ins><span class="cx">         &quot;architecture&quot;: &quot;armv7s&quot;
</span><span class="cx">     },
</span><span class="cx">     &quot;iOS Simulator EWS&quot;: {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx">     def port(port_name):
</span><span class="cx">         ports = {
</span><span class="cx">             &quot;gtk-wk2&quot;: GtkWK2Port,
</span><ins>+            &quot;ios-device&quot;: IOSPort,
+            # FIXME: https://bugs.webkit.org/show_bug.cgi?id=169302
</ins><span class="cx">             &quot;ios&quot;: IOSPort,
</span><span class="cx">             &quot;ios-simulator-wk2&quot;: IOSSimulatorWK2Port,
</span><span class="cx">             &quot;mac&quot;: MacPort,
</span><span class="lines">@@ -130,7 +132,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class IOSPort(DeprecatedPort):
</span><del>-    port_flag_name = &quot;ios&quot;
</del><ins>+    port_flag_name = &quot;ios-device&quot;
</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 (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/factory.py        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py        2017-03-09 19:46:19 UTC (rev 213654)
</span><span class="lines">@@ -47,6 +47,9 @@
</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><ins>+        optparse.make_option('--simulator', action='store_const', dest='platform',
+            const=('ios-simulator'),
+            help=('DEPRECATED 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 class="lines">@@ -80,12 +83,7 @@
</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.  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.
</del><ins>+    # first.
</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 (213653 => 213654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios_device.py        2017-03-09 19:18:34 UTC (rev 213653)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device.py        2017-03-09 19:46:19 UTC (rev 213654)
</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'
</del><ins>+    port_name = 'ios-device'
</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'
</del><ins>+        return 'ios-device'
</ins></span></pre>
</div>
</div>

</body>
</html>