<!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>[165267] 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/165267">165267</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-07 09:27:42 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] buid-webkit should use CMake by default
https://bugs.webkit.org/show_bug.cgi?id=129855
Reviewed by Carlos Garcia Campos.
Make the CMake build the default GTK+ build when using build-webkit. This will
ensure that all bots are using CMake. We do this by swapping --gtk and --gtkcmake,
so that we have --gtk and --gtkautotools.
* Scripts/webkitdirs.pm: Swap --gtkcmake/--gtk for --gtk/--gtkautotools.
* Scripts/webkitpy/port/gtk.py: Ditto.</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>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165266 => 165267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/ChangeLog 2014-03-07 17:27:42 UTC (rev 165267)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-07 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] buid-webkit should use CMake by default
+ https://bugs.webkit.org/show_bug.cgi?id=129855
+
+ Reviewed by Carlos Garcia Campos.
+
+ Make the CMake build the default GTK+ build when using build-webkit. This will
+ ensure that all bots are using CMake. We do this by swapping --gtk and --gtkcmake,
+ so that we have --gtk and --gtkautotools.
+
+ * Scripts/webkitdirs.pm: Swap --gtkcmake/--gtk for --gtk/--gtkautotools.
+ * Scripts/webkitpy/port/gtk.py: Ditto.
+
</ins><span class="cx"> 2014-03-06 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] [GTK] Build with ninja when it is available
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (165266 => 165267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-03-07 17:27:42 UTC (rev 165267)
</span><span class="lines">@@ -374,8 +374,8 @@
</span><span class="cx"> push(@args, '--release') if ($configuration =~ "^Release");
</span><span class="cx"> push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
</span><span class="cx"> push(@args, '--64-bit') if (isWin64());
</span><del>- push(@args, '--gtk') if isGtkAutotools();
- push(@args, '--gtkcmake') if isGtkCMake();
</del><ins>+ push(@args, '--gtkautotools') if isGtkAutotools();
+ push(@args, '--gtk') if isGtkCMake();
</ins><span class="cx"> push(@args, '--efl') if isEfl();
</span><span class="cx"> push(@args, '--wincairo') if isWinCairo();
</span><span class="cx"> push(@args, '--wince') if isWinCE();
</span><span class="lines">@@ -945,7 +945,7 @@
</span><span class="cx"> sub determineIsGtkCMake()
</span><span class="cx"> {
</span><span class="cx"> return if defined($isGtkCMake);
</span><del>- $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtkcmake");
</del><ins>+ $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtk");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isGtkCMake()
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> sub determineIsGtkAutotools()
</span><span class="cx"> {
</span><span class="cx"> return if defined($isGtkAutotools);
</span><del>- $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtk");
</del><ins>+ $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtkautotools");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isWinCE()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (165266 => 165267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-03-07 17:21:46 UTC (rev 165266)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-03-07 17:27:42 UTC (rev 165267)
</span><span class="lines">@@ -73,9 +73,9 @@
</span><span class="cx">
</span><span class="cx"> def _port_flag_for_scripts(self):
</span><span class="cx"> if self._is_cmake_build():
</span><del>- return "--gtkcmake"
</del><ins>+ return "--gtk"
</ins><span class="cx"> else:
</span><del>- return "--gtk"
</del><ins>+ return "--gtkautotools"
</ins><span class="cx">
</span><span class="cx"> @memoized
</span><span class="cx"> def _driver_class(self):
</span><span class="lines">@@ -215,9 +215,9 @@
</span><span class="cx"> def build_webkit_command(self, build_style=None):
</span><span class="cx"> command = super(GtkPort, self).build_webkit_command(build_style)
</span><span class="cx"> if self._is_cmake_build():
</span><del>- command.extend(["--gtkcmake", "--update-gtk"])
</del><ins>+ command.extend(["--gtk", "--update-gtk"])
</ins><span class="cx"> else:
</span><del>- command.extend(["--gtk", "--update-gtk"])
</del><ins>+ command.extend(["--gtkautotools", "--update-gtk"])
</ins><span class="cx">
</span><span class="cx"> if self.get_option('webkit_test_runner'):
</span><span class="cx"> command.append("--no-webkit1")
</span></span></pre>
</div>
</div>
</body>
</html>