<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195057] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195057">195057</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-14 08:31:58 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake][GTK] CMake Error: Could not create named generator Eclipse CDT4 - Ninja
https://bugs.webkit.org/show_bug.cgi?id=132599
Patch by Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au> on 2016-01-14
Reviewed by Michael Catanzaro.
Check if cmake Ninja generators are installed.
* Scripts/webkitdirs.pm:
(canUseNinjaGenerator):
(canUseEclipseNinjaGenerator):
(generateBuildSystemFromCMakeProject):
(canUseEclipse): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195056 => 195057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-14 14:42:22 UTC (rev 195056)
+++ trunk/Tools/ChangeLog 2016-01-14 16:31:58 UTC (rev 195057)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-14 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
+
+ [CMake][GTK] CMake Error: Could not create named generator Eclipse CDT4 - Ninja
+ https://bugs.webkit.org/show_bug.cgi?id=132599
+
+ Reviewed by Michael Catanzaro.
+
+ Check if cmake Ninja generators are installed.
+
+ * Scripts/webkitdirs.pm:
+ (canUseNinjaGenerator):
+ (canUseEclipseNinjaGenerator):
+ (generateBuildSystemFromCMakeProject):
+ (canUseEclipse): Deleted.
+
</ins><span class="cx"> 2016-01-13 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Testing with font family name "System Font" is unused
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (195056 => 195057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-01-14 14:42:22 UTC (rev 195056)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-01-14 16:31:58 UTC (rev 195057)
</span><span class="lines">@@ -1909,11 +1909,20 @@
</span><span class="cx"> return commandExists("ninja") || commandExists("ninja-build");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub canUseEclipse(@)
</del><ins>+sub canUseNinjaGenerator(@)
</ins><span class="cx"> {
</span><del>- return commandExists("eclipse");
</del><ins>+ # Check that a Ninja generator is installed
+ my $devnull = File::Spec->devnull();
+ return exitStatus(system("cmake -N -G Ninja >$devnull 2>&1")) == 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+sub canUseEclipseNinjaGenerator(@)
+{
+ # Check that eclipse and eclipse Ninja generator is installed
+ my $devnull = File::Spec->devnull();
+ return commandExists("eclipse") && exitStatus(system("cmake -N -G 'Eclipse CDT4 - Ninja' >$devnull 2>&1")) == 0;
+}
+
</ins><span class="cx"> sub cmakeGeneratedBuildfile(@)
</span><span class="cx"> {
</span><span class="cx"> my ($willUseNinja) = @_;
</span><span class="lines">@@ -1936,7 +1945,7 @@
</span><span class="cx"> chdir($buildPath) or die;
</span><span class="cx">
</span><span class="cx"> # We try to be smart about when to rerun cmake, so that we can have faster incremental builds.
</span><del>- my $willUseNinja = canUseNinja();
</del><ins>+ my $willUseNinja = canUseNinja() && canUseNinjaGenerator();
</ins><span class="cx"> if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1953,7 +1962,7 @@
</span><span class="cx">
</span><span class="cx"> if ($willUseNinja) {
</span><span class="cx"> push @args, "-G";
</span><del>- if (canUseEclipse()) {
</del><ins>+ if (canUseEclipseNinjaGenerator()) {
</ins><span class="cx"> push @args, "'Eclipse CDT4 - Ninja'";
</span><span class="cx"> } else {
</span><span class="cx"> push @args, "Ninja";
</span></span></pre>
</div>
</div>
</body>
</html>