Title: [167932] trunk/Tools
- Revision
- 167932
- Author
- commit-qu...@webkit.org
- Date
- 2014-04-29 08:17:08 -0700 (Tue, 29 Apr 2014)
Log Message
Generate Eclipse project + ninja build for GTK+ if Eclipse in available in the PATH
https://bugs.webkit.org/show_bug.cgi?id=132190
Patch by Enrique Ocaña González <eoca...@igalia.com> on 2014-04-29
Reviewed by Gustavo Noronha Silva.
* Scripts/webkitdirs.pm:
(canUseEclipse): Test if Eclipse is in the path. This is the same method used to test
if ninja is in the path.
(generateBuildSystemFromCMakeProject): Use the eclipse generator if possible, fallback
to the previous ninja generator if not.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (167931 => 167932)
--- trunk/Tools/ChangeLog 2014-04-29 15:01:18 UTC (rev 167931)
+++ trunk/Tools/ChangeLog 2014-04-29 15:17:08 UTC (rev 167932)
@@ -1,3 +1,16 @@
+2014-04-29 Enrique Ocaña González <eoca...@igalia.com>
+
+ Generate Eclipse project + ninja build for GTK+ if Eclipse in available in the PATH
+ https://bugs.webkit.org/show_bug.cgi?id=132190
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Scripts/webkitdirs.pm:
+ (canUseEclipse): Test if Eclipse is in the path. This is the same method used to test
+ if ninja is in the path.
+ (generateBuildSystemFromCMakeProject): Use the eclipse generator if possible, fallback
+ to the previous ninja generator if not.
+
2014-04-29 Jozsef Berta <jberta.u-sze...@partner.samsung.com>
check-webkit-style should understand --git-index
Modified: trunk/Tools/Scripts/webkitdirs.pm (167931 => 167932)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-04-29 15:01:18 UTC (rev 167931)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-04-29 15:17:08 UTC (rev 167932)
@@ -1781,6 +1781,12 @@
return $? == 0;
}
+sub canUseEclipse(@)
+{
+ system('which eclipse > /dev/null');
+ return $? == 0;
+}
+
sub cmakeGeneratedBuildfile(@)
{
my ($willUseNinja) = @_;
@@ -1819,7 +1825,11 @@
if ($willUseNinja) {
push @args, "-G";
- push @args, "Ninja";
+ if (canUseEclipse()) {
+ push @args, "'Eclipse CDT4 - Ninja'";
+ } else {
+ push @args, "Ninja";
+ }
}
# Don't warn variables which aren't used by cmake ports.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
