<!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>[178641] 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/178641">178641</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-18 23:15:38 -0800 (Sun, 18 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS EWS queue name should be consistent
<http://webkit.org/b/140585>
Reviewed by Daniel Bates.
* Scripts/webkitpy/common/config/ews.json: Rename 'ios-device'
to 'ios'.
* Scripts/webkitpy/common/config/ports.py: Ditto.
(DeprecatedPort.port):
(IOSPort):
* Scripts/webkitpy/port/ios.py: Ditto.
(IOSPort):
* Scripts/webkitpy/port/factory.py:
(PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort
appears before ios.IOSPort. If this is not done,
`run-webkit-tests --ios-simulator` will get the wrong Port class
(IOSPort instead of IOSSimulatorPort) due to the way that
PortFactory.get() uses prefix matching of <Port>.port_name to
find the correct class to use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178640 => 178641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/ChangeLog 2015-01-19 07:15:38 UTC (rev 178641)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-18 David Kilzer <ddkilzer@apple.com>
+
+ iOS EWS queue name should be consistent
+ <http://webkit.org/b/140585>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/common/config/ews.json: Rename 'ios-device'
+ to 'ios'.
+ * Scripts/webkitpy/common/config/ports.py: Ditto.
+ (DeprecatedPort.port):
+ (IOSPort):
+ * Scripts/webkitpy/port/ios.py: Ditto.
+ (IOSPort):
+
+ * Scripts/webkitpy/port/factory.py:
+ (PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort
+ appears before ios.IOSPort. If this is not done,
+ `run-webkit-tests --ios-simulator` will get the wrong Port class
+ (IOSPort instead of IOSSimulatorPort) due to the way that
+ PortFactory.get() uses prefix matching of <Port>.port_name to
+ find the correct class to use.
+
</ins><span class="cx"> 2015-01-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> build.webkit.org/dashboard: OS X EWS is now on Mavericks
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigewsjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (178640 => 178641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-01-19 07:15:38 UTC (rev 178641)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> "port": "win"
</span><span class="cx"> },
</span><span class="cx"> "iOS EWS": {
</span><del>- "port": "ios-device",
</del><ins>+ "port": "ios",
</ins><span class="cx"> "architecture": "armv7"
</span><span class="cx"> },
</span><span class="cx"> "Mac EWS": {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (178640 => 178641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2015-01-19 07:15:38 UTC (rev 178641)
</span><span class="lines">@@ -64,7 +64,7 @@
</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,
</del><ins>+ "ios": IOSPort,
</ins><span class="cx"> "mac": MacPort,
</span><span class="cx"> "mac-wk2": MacWK2Port,
</span><span class="cx"> "win": WinPort,
</span><span class="lines">@@ -121,7 +121,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 (178640 => 178641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-19 07:15:38 UTC (rev 178641)
</span><span class="lines">@@ -80,11 +80,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class PortFactory(object):
</span><ins>+ # Order matters. For port classes that have a port_name with a
+ # common prefix, the more specific port class should be listed
+ # first. For example, 'ios.IOSSimulatorPort' (port_name='ios-simulator')
+ # should be listed before 'ios.IOSPort' (port_name='ios'). If this
+ # rule is not followed, then `webkit-patch --ios-simulator` will try
+ # to use IOSPort instead of IOSSimulatorPort because 'ios'
+ # (IOSPort.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><ins>+ 'ios.IOSSimulatorPort',
</ins><span class="cx"> 'ios.IOSPort',
</span><del>- 'ios.IOSSimulatorPort',
</del><span class="cx"> 'mac.MacPort',
</span><span class="cx"> 'mock_drt.MockDRTPort',
</span><span class="cx"> 'test.TestPort',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (178640 => 178641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-19 07:15:38 UTC (rev 178641)
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class IOSPort(ApplePort):
</span><del>- port_name = "ios-device"
</del><ins>+ port_name = "ios"
</ins><span class="cx">
</span><span class="cx"> ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
</span><del>- VERSION_FALLBACK_ORDER = ['ios-device-7', 'ios-device-8']
</del><ins>+ VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8']
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def determine_full_port_name(cls, host, options, port_name):
</span></span></pre>
</div>
</div>
</body>
</html>