Title: [137375] trunk/Tools
- Revision
- 137375
- Author
- [email protected]
- Date
- 2012-12-11 15:45:29 -0800 (Tue, 11 Dec 2012)
Log Message
Unreviewed, rolling out r137371.
http://trac.webkit.org/changeset/137371
https://bugs.webkit.org/show_bug.cgi?id=104434
Various scripts are not ready for out/ as the build directory,
this can't work as written.
* Scripts/update-webkit:
* Scripts/webkitdirs.pm:
(buildChromium):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137374 => 137375)
--- trunk/Tools/ChangeLog 2012-12-11 23:42:11 UTC (rev 137374)
+++ trunk/Tools/ChangeLog 2012-12-11 23:45:29 UTC (rev 137375)
@@ -1,3 +1,16 @@
+2012-12-11 Eric Seidel <[email protected]>
+
+ Unreviewed, rolling out r137371.
+ http://trac.webkit.org/changeset/137371
+ https://bugs.webkit.org/show_bug.cgi?id=104434
+
+ Various scripts are not ready for out/ as the build directory,
+ this can't work as written.
+
+ * Scripts/update-webkit:
+ * Scripts/webkitdirs.pm:
+ (buildChromium):
+
2012-12-11 Zan Dobersek <[email protected]>
Unreviewed GTK build functionality fix.
Modified: trunk/Tools/Scripts/update-webkit (137374 => 137375)
--- trunk/Tools/Scripts/update-webkit 2012-12-11 23:42:11 UTC (rev 137374)
+++ trunk/Tools/Scripts/update-webkit 2012-12-11 23:45:29 UTC (rev 137375)
@@ -47,7 +47,7 @@
my $showHelp;
my $useGYP = 0;
my $useMake = 0;
-my $useNinja = 1;
+my $useNinja = 0;
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)
- --no-ninja generate the platform-native build system instead of ninja (Chromium only)
+ --ninja generate the ninja-based build system (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 (137374 => 137375)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-12-11 23:42:11 UTC (rev 137374)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-12-11 23:45:29 UTC (rev 137375)
@@ -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()) {
+ } elsif (isChromiumNinja() && !isChromiumAndroid()) {
$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
