Diff
Modified: trunk/Tools/ChangeLog (213576 => 213577)
--- trunk/Tools/ChangeLog 2017-03-08 17:44:23 UTC (rev 213576)
+++ trunk/Tools/ChangeLog 2017-03-08 17:50:36 UTC (rev 213577)
@@ -1,3 +1,15 @@
+2017-03-08 Jonathan Bedard <[email protected]>
+
+ 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
+
2017-03-07 Kocsen Chung <[email protected]>
Perf and layout test results should report using correct scm revision.
Modified: trunk/Tools/Scripts/build-webkit (213576 => 213577)
--- 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)
@@ -92,10 +92,8 @@
--debug Compile with Debug configuration
--release Compile with Release configuration
--sdk=<sdk> Use a specific Xcode SDK (iOS and Mac only)
- --ios-device Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
- --device DEPRECATED alias of --ios-device
+ --device Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
--ios-simulator Use the current iphonesimulator SDK (iOS only)
- --simulator DEPRECATED alias of --ios-simulator
--coverage Enable code coverage support (Mac only)
--analyze Enable static anaylsis (iOS and Mac only)
Modified: trunk/Tools/Scripts/package-root (213576 => 213577)
--- 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)
@@ -46,10 +46,8 @@
--help Show this help message
--sdk Specifies SDK for which the roots are staged
(Default: currently installed Base SDK)
- --ios-device Equivalent to --sdk iphoneos.internal
- --device DEPRECATED alias of --ios-device
+ --device Equivalent to --sdk iphoneos.internal
--ios-simulator Equivalent to --sdk iphonesimulator
- --simulator DEPRECATED alias of --ios-simulator
--debug Package roots from Debug-<platform>
--release Package roots from Release-<platform>
Modified: trunk/Tools/Scripts/run-api-tests (213576 => 213577)
--- 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)
@@ -78,7 +78,6 @@
Platform options:
--ios-simulator Run tests in the iOS Simulator
- --simulator DEPRECATED alias of --ios-simulator
@{[ sharedCommandLineOptionsUsage(indent => 2, switchWidth => 21) ]}
Examples
Modified: trunk/Tools/Scripts/webkitdirs.pm (213576 => 213577)
--- 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)
@@ -438,7 +438,7 @@
# These are determined automatically from stored configuration.
push(@args, '--debug') if ($configuration =~ "^Debug");
push(@args, '--release') if ($configuration =~ "^Release");
- push(@args, '--ios-device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
+ push(@args, '--device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
push(@args, '--64-bit') if (isWin64());
@@ -457,11 +457,11 @@
if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) {
$xcodeSDK = $sdk;
}
- if (checkForArgumentAndRemoveFromARGV("--device") || checkForArgumentAndRemoveFromARGV("--ios-device")) {
+ if (checkForArgumentAndRemoveFromARGV("--device")) {
my $hasInternalSDK = exitStatus(system("xcrun --sdk iphoneos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
$xcodeSDK ||= $hasInternalSDK ? "iphoneos.internal" : "iphoneos";
}
- if (checkForArgumentAndRemoveFromARGV("--simulator") || checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
+ if (checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
$xcodeSDK ||= 'iphonesimulator';
}
}
Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (213576 => 213577)
--- 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)
@@ -12,7 +12,7 @@
]
},
"iOS EWS": {
- "port": "ios-device",
+ "port": "ios",
"architecture": "armv7s"
},
"iOS Simulator EWS": {
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (213576 => 213577)
--- 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)
@@ -64,8 +64,6 @@
def port(port_name):
ports = {
"gtk-wk2": GtkWK2Port,
- "ios-device": IOSPort,
- # FIXME: https://bugs.webkit.org/show_bug.cgi?id=169302
"ios": IOSPort,
"ios-simulator-wk2": IOSSimulatorWK2Port,
"mac": MacPort,
@@ -132,7 +130,7 @@
class IOSPort(DeprecatedPort):
- port_flag_name = "ios-device"
+ port_flag_name = "ios"
def build_webkit_command(self, build_style=None):
command = super(IOSPort, self).build_webkit_command(build_style=build_style)
Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (213576 => 213577)
--- 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)
@@ -47,9 +47,6 @@
optparse.make_option('--ios-simulator', action='', dest='platform',
const=('ios-simulator'),
help=('Alias for --platform=ios-simulator')),
- optparse.make_option('--simulator', action='', dest='platform',
- const=('ios-simulator'),
- help=('DEPRECATED alias for --platform=ios-simulator')),
optparse.make_option('--efl', action='', dest='platform',
const=('efl*' if use_globs else 'efl'),
help=('Alias for --platform=efl*' if use_globs else 'Alias for --platform=efl')),
@@ -83,7 +80,12 @@
class PortFactory(object):
# Order matters. For port classes that have a port_name with a
# common prefix, the more specific port class should be listed
- # first.
+ # 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.
PORT_CLASSES = (
'efl.EflPort',
'gtk.GtkPort',
Modified: trunk/Tools/Scripts/webkitpy/port/ios_device.py (213576 => 213577)
--- 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)
@@ -28,7 +28,7 @@
class IOSDevicePort(IOSPort):
- port_name = 'ios-device'
+ port_name = 'ios'
ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
DEFAULT_ARCHITECTURE = 'arm64'
@@ -49,4 +49,4 @@
return ['--sdk', 'iphoneos'] + (['ARCHS=%s' % self.architecture()] if self.architecture() else [])
def operating_system(self):
- return 'ios-device'
+ return 'ios'
