<!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>[161328] 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/161328">161328</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-05 20:09:02 -0800 (Sun, 05 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Add support for building the GTK+ port with cmake to build-webkit
https://bugs.webkit.org/show_bug.cgi?id=126212
Reviewed by Daniel Bates.
Allow building the GTK+ cmake port with --gtkcmake.
* Scripts/build-webkit: Use the new isGtkCMake function to head down the CMake path
when appropriate. Skip the autotoos path when isGtkAutotools is false.
* Scripts/webkitdirs.pm: Add an isGtkCMake path in addition to the newly renamed isGtkAutotools.
Add isGtk which checks isGtkCMake || isGtkAutotools
(determineArchitecture): Use the CMake path for GTK+ when appropriate.
(argumentsForConfiguration): use --gtkcmake when appropriate.
(jscProductDir): Look in the CMake directory when appropriate.
(builtDylibPathForName): CMake builds the library into a different directory, so handle that.
(determineIsGtkCMake): Added.
(isGtkCMake): Added.
(isGtkAutotools): Renamed from isGtk.
(isGtk): New function which returns isGtkAutotools || isGtkCMake.
(determineIsGtkAutotools): Renamed from determineIsGtk.
(cmakeBasedPortName): Added a GTK+ path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</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 (161327 => 161328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-06 04:08:30 UTC (rev 161327)
+++ trunk/Tools/ChangeLog 2014-01-06 04:09:02 UTC (rev 161328)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK][CMake] Add support for building the GTK+ port with cmake to build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=126212
+
+ Reviewed by Daniel Bates.
+
+ Allow building the GTK+ cmake port with --gtkcmake.
+
+ * Scripts/build-webkit: Use the new isGtkCMake function to head down the CMake path
+ when appropriate. Skip the autotoos path when isGtkAutotools is false.
+ * Scripts/webkitdirs.pm: Add an isGtkCMake path in addition to the newly renamed isGtkAutotools.
+ Add isGtk which checks isGtkCMake || isGtkAutotools
+ (determineArchitecture): Use the CMake path for GTK+ when appropriate.
+ (argumentsForConfiguration): use --gtkcmake when appropriate.
+ (jscProductDir): Look in the CMake directory when appropriate.
+ (builtDylibPathForName): CMake builds the library into a different directory, so handle that.
+ (determineIsGtkCMake): Added.
+ (isGtkCMake): Added.
+ (isGtkAutotools): Renamed from isGtk.
+ (isGtk): New function which returns isGtkAutotools || isGtkCMake.
+ (determineIsGtkAutotools): Renamed from determineIsGtk.
+ (cmakeBasedPortName): Added a GTK+ path.
+
</ins><span class="cx"> 2014-01-04 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Fix the video and audio build
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (161327 => 161328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-01-06 04:08:30 UTC (rev 161327)
+++ trunk/Tools/Scripts/build-webkit 2014-01-06 04:09:02 UTC (rev 161328)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> buildCMakeProjectOrExit($clean, "Nix", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (isEfl()) {
</del><ins>+if (isEfl() || isGtkCMake()) {
</ins><span class="cx"> # By default we build using all of the available CPUs.
</span><span class="cx"> $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
</span><span class="cx"> $cmakeArgs = "-DENABLE_WEBKIT=OFF " . $cmakeArgs if $noWebKit1;
</span><span class="lines">@@ -300,7 +300,8 @@
</span><span class="cx"> # we enable new features. This forces a reconfiguration.
</span><span class="cx"> removeCMakeCache();
</span><span class="cx">
</span><del>- buildCMakeProjectOrExit($clean, "Efl", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
</del><ins>+ my $portName = (isEfl() ? "Efl" : "GTK");
+ buildCMakeProjectOrExit($clean, $portName, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isWinCE()) {
</span><span class="lines">@@ -325,14 +326,14 @@
</span><span class="cx"> $result = 0;
</span><span class="cx">
</span><span class="cx"> # For Gtk the WebKit project builds all others
</span><del>- if (isGtk() && $dir ne "Source/WebKit") {
</del><ins>+ if (isGtkAutotools() && $dir ne "Source/WebKit") {
</ins><span class="cx"> chdirWebKit();
</span><span class="cx"> next;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $project = basename($dir);
</span><span class="cx"> my $baseProductDir = baseProductDir();
</span><del>- if (isGtk()) {
</del><ins>+ if (isGtkAutotools()) {
</ins><span class="cx"> $result = buildGtkProject($project, $clean, $prefixPath, $makeArgs, $noWebKit1, $noWebKit2, @features);
</span><span class="cx"> } elsif (isAppleMacWebKit()) {
</span><span class="cx"> my @local_options = @options;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (161327 => 161328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-06 04:08:30 UTC (rev 161327)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-06 04:09:02 UTC (rev 161328)
</span><span class="lines">@@ -90,7 +90,8 @@
</span><span class="cx"> my $nmPath;
</span><span class="cx"> my $osXVersion;
</span><span class="cx"> my $generateDsym;
</span><del>-my $isGtk;
</del><ins>+my $isGtkAutotools;
+my $isGtkCMake;
</ins><span class="cx"> my $isWinCE;
</span><span class="cx"> my $isWinCairo;
</span><span class="cx"> my $isWin64;
</span><span class="lines">@@ -291,7 +292,7 @@
</span><span class="cx"> determineBaseProductDir();
</span><span class="cx"> determineXcodeSDK();
</span><span class="cx">
</span><del>- if (isGtk()) {
</del><ins>+ if (isGtkAutotools()) {
</ins><span class="cx"> determineConfigurationProductDir();
</span><span class="cx"> my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile 2> /dev/null`;
</span><span class="cx"> if ($host_triple =~ m/^host = ([^-]+)-/) {
</span><span class="lines">@@ -316,7 +317,7 @@
</span><span class="cx"> $architecture = 'armv7';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elsif (isEfl() || isNix()) {
</del><ins>+ } elsif (isEfl() || isNix() || isGtkCMake()) {
</ins><span class="cx"> my $host_processor = "";
</span><span class="cx"> $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`;
</span><span class="cx"> if ($host_processor =~ m/^CMAKE_SYSTEM_PROCESSOR \"([^"]+)\"/) {
</span><span class="lines">@@ -379,7 +380,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 isGtk();
</del><ins>+ push(@args, '--gtk') if isGtkAutotools();
+ push(@args, '--gtkcmake') if isGtkCMake();
</ins><span class="cx"> push(@args, '--efl') if isEfl();
</span><span class="cx"> push(@args, '--nix') if isNix();
</span><span class="cx"> push(@args, '--wincairo') if isWinCairo();
</span><span class="lines">@@ -532,8 +534,8 @@
</span><span class="cx"> sub jscProductDir
</span><span class="cx"> {
</span><span class="cx"> my $productDir = productDir();
</span><del>- $productDir .= "/bin" if (isEfl() || isNix());
- $productDir .= "/Programs" if isGtk();
</del><ins>+ $productDir .= "/bin" if (isEfl() || isNix() || isGtkCMake());
+ $productDir .= "/Programs" if isGtkAutotools();
</ins><span class="cx">
</span><span class="cx"> return $productDir;
</span><span class="cx"> }
</span><span class="lines">@@ -777,8 +779,13 @@
</span><span class="cx"> my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
</span><span class="cx"> my $extension = isDarwin() ? ".dylib" : ".so";
</span><span class="cx">
</span><ins>+ my $builtLibraryPath = "$configurationProductDir/.libs/";
+ if (isGtkCMake()) {
+ $builtLibraryPath = "$configurationProductDir/lib/";
+ }
+
</ins><span class="cx"> foreach $libraryName (@libraries) {
</span><del>- my $libraryPath = "$configurationProductDir/.libs/" . $libraryName . $extension;
</del><ins>+ my $libraryPath = "$builtLibraryPath" . $libraryName . $extension;
</ins><span class="cx"> return $libraryPath if -e $libraryPath;
</span><span class="cx"> }
</span><span class="cx"> return "NotFound";
</span><span class="lines">@@ -1045,6 +1052,18 @@
</span><span class="cx"> return $isEfl;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub determineIsGtkCMake()
+{
+ return if defined($isGtkCMake);
+ $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtkcmake");
+}
+
+sub isGtkCMake()
+{
+ determineIsGtkCMake();
+ return $isGtkCMake;
+}
+
</ins><span class="cx"> sub determineIsNix()
</span><span class="cx"> {
</span><span class="cx"> return if defined($isNix);
</span><span class="lines">@@ -1056,16 +1075,22 @@
</span><span class="cx"> determineIsNix();
</span><span class="cx"> return $isNix;
</span><span class="cx"> }
</span><ins>+
+sub isGtkAutotools()
+{
+ determineIsGtkAutotools();
+ return $isGtkAutotools;
+}
+
</ins><span class="cx"> sub isGtk()
</span><span class="cx"> {
</span><del>- determineIsGtk();
- return $isGtk;
</del><ins>+ return isGtkCMake() || isGtkAutotools();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub determineIsGtk()
</del><ins>+sub determineIsGtkAutotools()
</ins><span class="cx"> {
</span><del>- return if defined($isGtk);
- $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
</del><ins>+ return if defined($isGtkAutotools);
+ $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtk");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isWinCE()
</span><span class="lines">@@ -2096,6 +2121,7 @@
</span><span class="cx"> return "Efl" if isEfl();
</span><span class="cx"> return "WinCE" if isWinCE();
</span><span class="cx"> return "Nix" if isNix();
</span><ins>+ return "GTK" if isGtk();
</ins><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>