Title: [137371] trunk/Tools
- Revision
- 137371
- Author
- [email protected]
- Date
- 2012-12-11 15:33:55 -0800 (Tue, 11 Dec 2012)
Log Message
Make Ninja the default build system for build-webkit --chromium
https://bugs.webkit.org/show_bug.cgi?id=104434
Reviewed by Daniel Bates.
As far as I can tell, most Chromium developers are now using Ninja
as their default build system instead of the native Xcode/Visual Studio/Make.
This change makes Ninja the default for developers as well as all Chromium webkit bots.
Developers can pass --no-ninja to get the platform-native buildsystem instead of Ninja.
It's possible we may wish to make this a per-platform default, and have
Ninja only be the default for Mac/Linux.
There was a thread on webkit-dev discussing this change:
http://lists.webkit.org/pipermail/webkit-dev/2012-December/023113.html
* Scripts/update-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137370 => 137371)
--- trunk/Tools/ChangeLog 2012-12-11 23:33:49 UTC (rev 137370)
+++ trunk/Tools/ChangeLog 2012-12-11 23:33:55 UTC (rev 137371)
@@ -1,3 +1,23 @@
+2012-12-11 Eric Seidel <[email protected]>
+
+ Make Ninja the default build system for build-webkit --chromium
+ https://bugs.webkit.org/show_bug.cgi?id=104434
+
+ Reviewed by Daniel Bates.
+
+ As far as I can tell, most Chromium developers are now using Ninja
+ as their default build system instead of the native Xcode/Visual Studio/Make.
+ This change makes Ninja the default for developers as well as all Chromium webkit bots.
+
+ Developers can pass --no-ninja to get the platform-native buildsystem instead of Ninja.
+ It's possible we may wish to make this a per-platform default, and have
+ Ninja only be the default for Mac/Linux.
+
+ There was a thread on webkit-dev discussing this change:
+ http://lists.webkit.org/pipermail/webkit-dev/2012-December/023113.html
+
+ * Scripts/update-webkit:
+
2012-12-11 Dirk Pranke <[email protected]>
nrwt: record the order and run times of all of the tests in a single file
Modified: trunk/Tools/Scripts/update-webkit (137370 => 137371)
--- trunk/Tools/Scripts/update-webkit 2012-12-11 23:33:49 UTC (rev 137370)
+++ trunk/Tools/Scripts/update-webkit 2012-12-11 23:33:55 UTC (rev 137371)
@@ -47,7 +47,7 @@
my $showHelp;
my $useGYP = 0;
my $useMake = 0;
-my $useNinja = 0;
+my $useNinja = 1;
determineIsChromium();
determineIsChromiumAndroid();
@@ -61,7 +61,7 @@
'q|quiet' => \$quiet,
'gyp' => \$useGYP,
'make' => \$useMake,
- 'ninja' => \$useNinja,
+ 'ninja!' => \$useNinja,
);
if (!$getOptionsResult || $showHelp) {
@@ -69,7 +69,7 @@
Usage: @{[ basename($0) ]} [options]
--chromium also update dependencies of the chromium port
--make generate the Makefile-based build system (Chromium only)
- --ninja generate the ninja-based build system (Chromium only)
+ --no-ninja generate the platform-native build system instead of ninja (Chromium only)
--chromium-android also update dependencies of the chromium port for Android
-h|--help show the help message
-q|--quiet pass -q to svn update for quiet updates
Modified: trunk/Tools/Scripts/webkitdirs.pm (137370 => 137371)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-12-11 23:33:49 UTC (rev 137370)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-12-11 23:33:55 UTC (rev 137371)
@@ -2545,7 +2545,7 @@
} elsif (isCygwin() || isWindows()) {
# Windows build - builds the root visual studio solution.
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
- } elsif (isChromiumNinja() && !isChromiumAndroid()) {
+ } elsif (isChromiumNinja()) {
$result = buildChromiumNinja("all", $clean, @options);
} elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
# Linux build - build using make.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
