Title: [139689] trunk/Tools
- Revision
- 139689
- Author
- tha...@chromium.org
- Date
- 2013-01-14 17:00:42 -0800 (Mon, 14 Jan 2013)
Log Message
[chromium] Enable `update-webkit --chromium --ninja` on windows
https://bugs.webkit.org/show_bug.cgi?id=106836
Reviewed by Eric Seidel.
After running this, build-webkit --chromium will use ninja to build.
Apparently there are some minor issues with that still, so it's
not quite ready for use yet.
* Scripts/webkitdirs.pm:
(determineIsChromiumNinja):
(buildChromium):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139688 => 139689)
--- trunk/Tools/ChangeLog 2013-01-15 00:56:35 UTC (rev 139688)
+++ trunk/Tools/ChangeLog 2013-01-15 01:00:42 UTC (rev 139689)
@@ -1,3 +1,18 @@
+2013-01-14 Nico Weber <tha...@chromium.org>
+
+ [chromium] Enable `update-webkit --chromium --ninja` on windows
+ https://bugs.webkit.org/show_bug.cgi?id=106836
+
+ Reviewed by Eric Seidel.
+
+ After running this, build-webkit --chromium will use ninja to build.
+ Apparently there are some minor issues with that still, so it's
+ not quite ready for use yet.
+
+ * Scripts/webkitdirs.pm:
+ (determineIsChromiumNinja):
+ (buildChromium):
+
2013-01-14 Dirk Pranke <dpra...@chromium.org>
nrwt: use the same search path for baselines and TestExpectations on apple mac
Modified: trunk/Tools/Scripts/webkitdirs.pm (139688 => 139689)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-01-15 00:56:35 UTC (rev 139688)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-01-15 01:00:42 UTC (rev 139689)
@@ -1220,7 +1220,12 @@
$statMake = stat('Makefile.chromium')->mtime;
}
- $hasUpToDateNinjabuild = $statNinja > $statXcode && $statNinja > $statMake;
+ my $statVisualStudio = 0;
+ if (-e 'Source/WebKit/chromium/All.sln') {
+ $statVisualStudio = stat('Source/WebKit/chromium/All.sln')->mtime;
+ }
+
+ $hasUpToDateNinjabuild = $statNinja > $statXcode && $statNinja > $statMake && $statNinja > $statVisualStudio;
}
$isChromiumNinja = $hasUpToDateNinjabuild;
}
@@ -2552,7 +2557,7 @@
if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake() && !isChromiumNinja()) {
# Mac build - builds the root xcode project.
$result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
- } elsif (isCygwin() || isWindows()) {
+ } elsif ((isCygwin() || isWindows()) && !isChromiumNinja()) {
# Windows build - builds the root visual studio solution.
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
} elsif (isChromiumNinja()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
