<!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>[204278] 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/204278">204278</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-09 02:11:06 -0700 (Tue, 09 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow more --cmakeargs option in build-jsc and build-webkit
https://bugs.webkit.org/show_bug.cgi?id=160340
Reviewed by Michael Catanzaro.
* Scripts/build-jsc:
* Scripts/build-webkit:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204277 => 204278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/ChangeLog 2016-08-09 09:11:06 UTC (rev 204278)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-09 Csaba Osztrogonác <ossy@webkit.org>
+
+ Allow more --cmakeargs option in build-jsc and build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=160340
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/build-jsc:
+ * Scripts/build-webkit:
+
</ins><span class="cx"> 2016-08-09 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Do not check if WebKitLibraries folder exists on EFL and GTK
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (204277 => 204278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/Scripts/build-jsc 2016-08-09 09:11:06 UTC (rev 204278)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> my $forceCLoop = 0;
</span><span class="cx"> my $cli = 0;
</span><span class="cx"> my $makeArgs = "";
</span><del>-my $cmakeArgs = "";
</del><ins>+my @cmakeArgs;
</ins><span class="cx"> my $copyLibraries = 1;
</span><span class="cx"> my $startTime = time();
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> --cloop Use C Loop interpreter (default: $forceCLoop)
</span><span class="cx"> --cli Build the new jsc command line interface (default: $cli)
</span><span class="cx"> --makeargs=<arguments> Optional Makefile flags
</span><del>- --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
</del><ins>+ --cmakeargs=<arguments> One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> GetOptions(
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> 'cli!' => \$cli,
</span><span class="cx"> 'copy-libraries!' => \$copyLibraries,
</span><span class="cx"> 'makeargs=s' => \$makeArgs,
</span><del>- 'cmakeargs=s' => \$cmakeArgs
</del><ins>+ 'cmakeargs=s' => \@cmakeArgs
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ($showHelp) {
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isCMakeBuild()) {
</span><del>- $cmakeArgs .= $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
- $cmakeArgs .= $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
</del><ins>+ push @cmakeArgs, $forceCLoop ? " -DENABLE_JIT=OFF" : " -DENABLE_JIT=ON";
+ push @cmakeArgs, $ftlJIT ? " -DENABLE_FTL_JIT=ON" : " -DENABLE_FTL_JIT=OFF";
</ins><span class="cx">
</span><span class="cx"> my $buildTarget = "";
</span><span class="cx"> unless (isAnyWindows()) {
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # This call only returns if nothing wrong happened
</span><del>- buildCMakeProjectOrExit(0, undef, $buildTarget, (cmakeBasedPortArguments(), $cmakeArgs));
</del><ins>+ buildCMakeProjectOrExit(0, undef, $buildTarget, (cmakeBasedPortArguments(), @cmakeArgs));
</ins><span class="cx"> writeCongrats();
</span><span class="cx"> exit exitStatus(0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (204277 => 204278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2016-08-09 07:25:25 UTC (rev 204277)
+++ trunk/Tools/Scripts/build-webkit 2016-08-09 09:11:06 UTC (rev 204278)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> my $installLibs;
</span><span class="cx"> my $prefixPath;
</span><span class="cx"> my $makeArgs = "";
</span><del>-my $cmakeArgs = "";
</del><ins>+my @cmakeArgs;
</ins><span class="cx"> my $onlyWebKitProject = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> --prefix=<path> Set installation prefix to the given path (Gtk/Efl only)
</span><span class="cx"> --makeargs=<arguments> Optional Makefile flags
</span><del>- --cmakeargs=<arguments> Optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
</del><ins>+ --cmakeargs=<arguments> One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local")
</ins><span class="cx">
</span><span class="cx"> --minimal No optional features, unless explicitly enabled
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> 'install-libs=s' => \$installLibs,
</span><span class="cx"> 'prefix=s' => \$prefixPath,
</span><span class="cx"> 'makeargs=s' => \$makeArgs,
</span><del>- 'cmakeargs=s' => \$cmakeArgs,
</del><ins>+ 'cmakeargs=s' => \@cmakeArgs,
</ins><span class="cx"> 'minimal' => \$minimal,
</span><span class="cx"> 'only-webkit' => \$onlyWebKitProject,
</span><span class="cx"> 'coverage' => \$coverageSupport,
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> my @featureArgs = cMakeArgsFromFeatures();
</span><span class="cx"> removeCMakeCache(@featureArgs);
</span><span class="cx">
</span><del>- buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
</del><ins>+ buildCMakeProjectOrExit($clean, $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), @cmakeArgs);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $baseProductDir = baseProductDir();
</span></span></pre>
</div>
</div>
</body>
</html>