Title: [190524] trunk/Tools
- Revision
- 190524
- Author
- [email protected]
- Date
- 2015-10-02 14:44:10 -0700 (Fri, 02 Oct 2015)
Log Message
Provide "--no-ninja" option to avoid using Ninja
https://bugs.webkit.org/show_bug.cgi?id=149757
Reviewed by Alex Christensen.
Add a new command line argument understood by webkitdirs.pm so
that we can conditionally avoid using Ninja. This is an
'opt-out' argument, so no existing Ninja users should be affected.
* Scripts/webkitdirs.pm:
(canUseNinja): Check for option and block ninja if present.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190523 => 190524)
--- trunk/Tools/ChangeLog 2015-10-02 21:38:57 UTC (rev 190523)
+++ trunk/Tools/ChangeLog 2015-10-02 21:44:10 UTC (rev 190524)
@@ -1,3 +1,17 @@
+2015-10-02 Brent Fulgham <[email protected]>
+
+ Provide "--no-ninja" option to avoid using Ninja
+ https://bugs.webkit.org/show_bug.cgi?id=149757
+
+ Reviewed by Alex Christensen.
+
+ Add a new command line argument understood by webkitdirs.pm so
+ that we can conditionally avoid using Ninja. This is an
+ 'opt-out' argument, so no existing Ninja users should be affected.
+
+ * Scripts/webkitdirs.pm:
+ (canUseNinja): Check for option and block ninja if present.
+
2015-10-02 Aakash Jain <[email protected]>
Flakiness dashboard should support OS X El Capitan
Modified: trunk/Tools/Scripts/webkitdirs.pm (190523 => 190524)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-02 21:38:57 UTC (rev 190523)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-02 21:44:10 UTC (rev 190524)
@@ -120,6 +120,7 @@
my $shouldTargetWebProcess;
my $shouldUseXPCServiceForWebProcess;
my $shouldUseGuardMalloc;
+my $shouldNotUseNinja;
my $xcodeVersion;
# Variables for Win32 support
@@ -1809,6 +1810,14 @@
sub canUseNinja(@)
{
+ if (!defined($shouldNotUseNinja)) {
+ $shouldNotUseNinja = checkForArgumentAndRemoveFromARGV("--no-ninja");
+ }
+
+ if ($shouldNotUseNinja) {
+ return 0;
+ }
+
# Test both ninja and ninja-build. Fedora uses ninja-build and has patched CMake to also call ninja-build.
return commandExists("ninja") || commandExists("ninja-build");
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
