Title: [139559] trunk/Tools
- Revision
- 139559
- Author
- [email protected]
- Date
- 2013-01-12 20:30:39 -0800 (Sat, 12 Jan 2013)
Log Message
Use ninja by default on Linux for build-webkit --chromium, bot edition
https://bugs.webkit.org/show_bug.cgi?id=104434
Reviewed by Eric Seidel.
r139557 changed update-webkit to pick ninja by default on linux, but
the bots run update-webkit-chromium directly so they didn't see this.
Move the default for ninja into update-webkit-chromium so that it's
picked up by the bots, and let update-webkit forward non-default
options to there.
This way, the default is in one place only and both developers (who
usually use update-webkit which then shells out to
updat-webkit-chromium) and bots (which use update-webkit-chromium
directly) see the same behavior.
* Scripts/update-webkit:
* Scripts/update-webkit-chromium:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139558 => 139559)
--- trunk/Tools/ChangeLog 2013-01-13 02:43:46 UTC (rev 139558)
+++ trunk/Tools/ChangeLog 2013-01-13 04:30:39 UTC (rev 139559)
@@ -1,5 +1,26 @@
2013-01-12 Nico Weber <[email protected]>
+ Use ninja by default on Linux for build-webkit --chromium, bot edition
+ https://bugs.webkit.org/show_bug.cgi?id=104434
+
+ Reviewed by Eric Seidel.
+
+ r139557 changed update-webkit to pick ninja by default on linux, but
+ the bots run update-webkit-chromium directly so they didn't see this.
+ Move the default for ninja into update-webkit-chromium so that it's
+ picked up by the bots, and let update-webkit forward non-default
+ options to there.
+
+ This way, the default is in one place only and both developers (who
+ usually use update-webkit which then shells out to
+ updat-webkit-chromium) and bots (which use update-webkit-chromium
+ directly) see the same behavior.
+
+ * Scripts/update-webkit:
+ * Scripts/update-webkit-chromium:
+
+2013-01-12 Nico Weber <[email protected]>
+
Make ninja the default build system on Linux for build-webkit --chromium
https://bugs.webkit.org/show_bug.cgi?id=104434
Modified: trunk/Tools/Scripts/update-webkit (139558 => 139559)
--- trunk/Tools/Scripts/update-webkit 2013-01-13 02:43:46 UTC (rev 139558)
+++ trunk/Tools/Scripts/update-webkit 2013-01-13 04:30:39 UTC (rev 139559)
@@ -47,7 +47,7 @@
my $showHelp;
my $useGYP = 0;
my $useMake = 0;
-my $useNinja = $^O eq "linux";
+my $useNinja = -1; # -1: Let update-webkit-chromium pick the default.
determineIsChromium();
determineIsChromiumAndroid();
@@ -82,9 +82,6 @@
if ($useMake) {
$ENV{"GYP_GENERATORS"} = "make";
}
-if ($useNinja) {
- $ENV{"GYP_GENERATORS"} = "ninja";
-}
my @svnOptions = ();
push @svnOptions, '-q' if $quiet;
@@ -105,6 +102,8 @@
my @chromiumUpdateArgs = ("perl", "Tools/Scripts/update-webkit-chromium");
push @chromiumUpdateArgs, "--chromium-android" if isChromiumAndroid();
push @chromiumUpdateArgs, "--force" if forceChromiumUpdate();
+ push @chromiumUpdateArgs, "--ninja" if $useNinja == 1;
+ push @chromiumUpdateArgs, "--no-ninja" if $useNinja == 0;
system(@chromiumUpdateArgs) == 0 or die $!;
} elsif (isAppleWinWebKit()) {
system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
Modified: trunk/Tools/Scripts/update-webkit-chromium (139558 => 139559)
--- trunk/Tools/Scripts/update-webkit-chromium 2013-01-13 02:43:46 UTC (rev 139558)
+++ trunk/Tools/Scripts/update-webkit-chromium 2013-01-13 04:30:39 UTC (rev 139559)
@@ -66,10 +66,17 @@
}
my $force = 0;
+my $useNinja = $^O eq "linux";
+
GetOptions(
'force' => \$force,
+ 'ninja!' => \$useNinja,
);
+if ($useNinja) {
+ $ENV{"GYP_GENERATORS"} = "ninja";
+}
+
# Execute gclient sync.
print "Updating chromium port dependencies using gclient...\n";
my @gclientArgs = ($gclientPath, "sync");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
