Title: [179162] trunk/Tools
- Revision
- 179162
- Author
- [email protected]
- Date
- 2015-01-26 20:06:36 -0800 (Mon, 26 Jan 2015)
Log Message
[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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179161 => 179162)
--- trunk/Tools/ChangeLog 2015-01-27 02:39:44 UTC (rev 179161)
+++ trunk/Tools/ChangeLog 2015-01-27 04:06:36 UTC (rev 179162)
@@ -1,5 +1,29 @@
2015-01-26 Simon Fraser <[email protected]>
+ [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 <[email protected]>
+
[iOS WK2] Fix possible crash when -[WKWebView evaluateJavaScript:completionHandler:] was called then the WKWebView is destroyed
https://bugs.webkit.org/show_bug.cgi?id=140203
rdar://problem/19198492
Modified: trunk/Tools/Scripts/package-root (179161 => 179162)
--- 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)
@@ -47,7 +47,7 @@
--sdk Specifies SDK for which the roots are staged
(Default: currently installed Base SDK)
--device Equivalent to --sdk iphoneos.internal
- --simulator Equivalent to --sdk iphonesimulator
+ --ios-simulator Equivalent to --sdk iphonesimulator
--debug Package roots from Debug-<platform>
--release Package roots from Release-<platform>
Modified: trunk/Tools/Scripts/webkitdirs.pm (179161 => 179162)
--- 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)
@@ -418,7 +418,6 @@
push(@args, '--debug') if ($configuration =~ "^Debug");
push(@args, '--release') if ($configuration =~ "^Release");
push(@args, '--device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
- push(@args, '--sim') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
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());
@@ -440,9 +439,7 @@
my $hasInternalSDK = exitStatus(system("xcrun --sdk iphoneos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
$xcodeSDK ||= $hasInternalSDK ? "iphoneos.internal" : "iphoneos";
}
- if (checkForArgumentAndRemoveFromARGV("--sim") ||
- checkForArgumentAndRemoveFromARGV("--simulator") ||
- checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
+ if (checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
$xcodeSDK ||= 'iphonesimulator';
}
}
Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (179161 => 179162)
--- 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)
@@ -44,12 +44,9 @@
return [
optparse.make_option('--platform', action='',
help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')),
- optparse.make_option('--ios-sim', action='', dest='platform',
- const=('ios-simulator'),
- help=('Alias for --platform=ios-sim*' if use_globs else 'Alias for --platform=ios-simulator')),
optparse.make_option('--ios-simulator', action='', dest='platform',
const=('ios-simulator'),
- help=('Alias for --platform=ios-sim*' if use_globs else 'Alias for --platform=ios-simulator')),
+ help=('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')),
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
