Changeset 139689 in webkit

Timestamp:

Jan 14, 2013 5:00:42 PM (11 years ago)

Author:

thakis@chromium.org

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-14  Nico Weber  <thakis@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  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1221 +1221 @@
         }
 
-        $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;
@@ -2553 +2558 @@
         # 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);