Title: [169088] trunk/Tools
- Revision
- 169088
- Author
- [email protected]
- Date
- 2014-05-19 17:43:59 -0700 (Mon, 19 May 2014)
Log Message
[iOS] REGRESSION (r168910): webkitdirs.pm: Be more forgiving when parsing --sdk, --device and --sim
<http://webkit.org/b/133089>
Reviewed by Darin Adler.
* Scripts/webkitdirs.pm:
(determineXcodeSDK): If both '--sdk SDKROOT' and '--sim' are
specified on the command line, we would remove the '--sdk'
arguments, but leave '--sim', potentially passing it along to
xcodebuild causing a build failure. This happens when
'old-run-webkit-tests --release --sim' invokes
build-dumprendertree when DumpRenderTree hasn't been built yet.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (169087 => 169088)
--- trunk/Tools/ChangeLog 2014-05-20 00:24:55 UTC (rev 169087)
+++ trunk/Tools/ChangeLog 2014-05-20 00:43:59 UTC (rev 169088)
@@ -1,3 +1,18 @@
+2014-05-19 David Kilzer <[email protected]>
+
+ [iOS] REGRESSION (r168910): webkitdirs.pm: Be more forgiving when parsing --sdk, --device and --sim
+ <http://webkit.org/b/133089>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitdirs.pm:
+ (determineXcodeSDK): If both '--sdk SDKROOT' and '--sim' are
+ specified on the command line, we would remove the '--sdk'
+ arguments, but leave '--sim', potentially passing it along to
+ xcodebuild causing a build failure. This happens when
+ 'old-run-webkit-tests --release --sim' invokes
+ build-dumprendertree when DumpRenderTree hasn't been built yet.
+
2014-05-19 David Farler <[email protected]>
Dashboard: OpenSource revision key changed from WebKitOpenSource to WebKit
Modified: trunk/Tools/Scripts/webkitdirs.pm (169087 => 169088)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-05-20 00:24:55 UTC (rev 169087)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-05-20 00:43:59 UTC (rev 169088)
@@ -398,11 +398,13 @@
my $sdk;
if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) {
$xcodeSDK = $sdk;
- } elsif (checkForArgumentAndRemoveFromARGV("--device")) {
- $xcodeSDK = 'iphoneos.internal';
- } elsif (checkForArgumentAndRemoveFromARGV("--sim") ||
+ }
+ if (checkForArgumentAndRemoveFromARGV("--device")) {
+ $xcodeSDK ||= 'iphoneos.internal';
+ }
+ if (checkForArgumentAndRemoveFromARGV("--sim") ||
checkForArgumentAndRemoveFromARGV("--simulator")) {
- $xcodeSDK = 'iphonesimulator';
+ $xcodeSDK ||= 'iphonesimulator';
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
