Title: [133246] trunk/Tools
- Revision
- 133246
- Author
- [email protected]
- Date
- 2012-11-01 17:59:08 -0700 (Thu, 01 Nov 2012)
Log Message
[chromium] Try to find ninja if it's not in the path already
https://bugs.webkit.org/show_bug.cgi?id=100988
Reviewed by Ryosuke Niwa.
Similar to the gclient detection logic in update-webkit-chromium
* Scripts/webkitdirs.pm:
(buildChromiumNinja):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (133245 => 133246)
--- trunk/Tools/ChangeLog 2012-11-02 00:41:36 UTC (rev 133245)
+++ trunk/Tools/ChangeLog 2012-11-02 00:59:08 UTC (rev 133246)
@@ -1,3 +1,15 @@
+2012-11-01 Nico Weber <[email protected]>
+
+ [chromium] Try to find ninja if it's not in the path already
+ https://bugs.webkit.org/show_bug.cgi?id=100988
+
+ Reviewed by Ryosuke Niwa.
+
+ Similar to the gclient detection logic in update-webkit-chromium
+
+ * Scripts/webkitdirs.pm:
+ (buildChromiumNinja):
+
2012-11-01 Eric Seidel <[email protected]>
Add Glenn Adams to the Contributor list
Modified: trunk/Tools/Scripts/webkitdirs.pm (133245 => 133246)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-11-02 00:41:36 UTC (rev 133245)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-11-02 00:59:08 UTC (rev 133246)
@@ -2429,8 +2429,18 @@
}
my $command = "";
- $command .= "ninja -C out/$config $target $makeArgs";
+ # Find ninja.
+ my $ninjaPath;
+ if (commandExists('ninja')) {
+ $ninjaPath = 'ninja';
+ } elsif (-e 'Source/WebKit/chromium/depot_tools/ninja') {
+ $ninjaPath = 'Source/WebKit/chromium/depot_tools/ninja';
+ } else {
+ die "ninja not found. Install chromium's depot_tools by running update-webkit first\n";
+ }
+ $command .= "$ninjaPath -C out/$config $target $makeArgs";
+
print "$command\n";
return system $command;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
