<!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>[195737] 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/195737">195737</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-28 08:18:32 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[webkitdirs] Don't pass cmakeBasedPortName around.
https://bugs.webkit.org/show_bug.cgi?id=153589
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-01-28
Reviewed by Darin Adler.
It should be local function of webkitdirs.pm instead.
* Scripts/build-jsc: Don't pass cmakeBasedPortName to
buildCMakeProjectOrExit().
* Scripts/build-webkit: Don't pass cmakeBasedPortName to
buildCMakeProjectOrExit() and generateBuildSystemFromCMakeProject().
* Scripts/run-efl-tests: Don't pass cmakeBasedPortName to
generateBuildSystemFromCMakeProject().
* Scripts/webkitdirs.pm: Don't export cmakeBasedPortName.
(generateBuildSystemFromCMakeProject): Removed $port argument as we
can get it from cmakeBasedPortName().
(buildCMakeProjectOrExit): Ditto.</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>
<li><a href="#trunkToolsScriptsrunefltests">trunk/Tools/Scripts/run-efl-tests</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 (195736 => 195737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/ChangeLog 2016-01-28 16:18:32 UTC (rev 195737)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-28 Konstantin Tokarev <annulen@yandex.ru>
+
+ [webkitdirs] Don't pass cmakeBasedPortName around.
+ https://bugs.webkit.org/show_bug.cgi?id=153589
+
+ Reviewed by Darin Adler.
+
+ It should be local function of webkitdirs.pm instead.
+
+ * Scripts/build-jsc: Don't pass cmakeBasedPortName to
+ buildCMakeProjectOrExit().
+ * Scripts/build-webkit: Don't pass cmakeBasedPortName to
+ buildCMakeProjectOrExit() and generateBuildSystemFromCMakeProject().
+ * Scripts/run-efl-tests: Don't pass cmakeBasedPortName to
+ generateBuildSystemFromCMakeProject().
+ * Scripts/webkitdirs.pm: Don't export cmakeBasedPortName.
+ (generateBuildSystemFromCMakeProject): Removed $port argument as we
+ can get it from cmakeBasedPortName().
+ (buildCMakeProjectOrExit): Ditto.
+
</ins><span class="cx"> 2016-01-28 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Clean up includes and headers related with GStreamerGL
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (195736 => 195737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/build-jsc 2016-01-28 16:18:32 UTC (rev 195737)
</span><span class="lines">@@ -112,7 +112,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, cmakeBasedPortName(), 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 (195736 => 195737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/build-webkit 2016-01-28 16:18:32 UTC (rev 195737)
</span><span class="lines">@@ -246,13 +246,13 @@
</span><span class="cx"> my @featureArgs = cMakeArgsFromFeatures();
</span><span class="cx"> removeCMakeCache(@featureArgs);
</span><span class="cx">
</span><del>- buildCMakeProjectOrExit($clean, cmakeBasedPortName(), $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 class="cx"> if (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> chdirWebKit();
</span><del>- if (exitStatus(generateBuildSystemFromCMakeProject(cmakeBasedPortName()))) {
</del><ins>+ if (exitStatus(generateBuildSystemFromCMakeProject())) {
</ins><span class="cx"> die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
</span><span class="cx"> }
</span><span class="cx"> chdirWebKit();
</span></span></pre></div>
<a id="trunkToolsScriptsrunefltests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-efl-tests (195736 => 195737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-efl-tests 2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/run-efl-tests 2016-01-28 16:18:32 UTC (rev 195737)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> # Manually add this for jhbuildWrapperPrefixIfNeeded().
</span><span class="cx"> push(@ARGV, "--efl");
</span><span class="cx">
</span><del>- my $returnCode = exitStatus(generateBuildSystemFromCMakeProject("Efl", undef, cmakeBasedPortArguments()));
</del><ins>+ my $returnCode = exitStatus(generateBuildSystemFromCMakeProject(undef, cmakeBasedPortArguments()));
</ins><span class="cx"> exit($returnCode) if $returnCode;
</span><span class="cx">
</span><span class="cx"> $returnCode = exitStatus(buildCMakeGeneratedProject("test"));
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (195736 => 195737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 15:16:02 UTC (rev 195736)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 16:18:32 UTC (rev 195737)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> &chdirWebKit
</span><span class="cx"> &checkFrameworks
</span><span class="cx"> &cmakeBasedPortArguments
</span><del>- &cmakeBasedPortName
</del><span class="cx"> &currentSVNRevision
</span><span class="cx"> &debugSafari
</span><span class="cx"> &executableProductDir
</span><span class="lines">@@ -1929,8 +1928,9 @@
</span><span class="cx">
</span><span class="cx"> sub generateBuildSystemFromCMakeProject
</span><span class="cx"> {
</span><del>- my ($port, $prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
</del><ins>+ my ($prefixPath, @cmakeArgs, $additionalCMakeArgs) = @_;
</ins><span class="cx"> my $config = configuration();
</span><ins>+ my $port = cmakeBasedPortName();
</ins><span class="cx"> my $buildPath = File::Spec->catdir(baseProductDir(), $config);
</span><span class="cx"> File::Path::mkpath($buildPath) unless -d $buildPath;
</span><span class="cx"> my $originalWorkingDirectory = getcwd();
</span><span class="lines">@@ -2031,9 +2031,9 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub buildCMakeProjectOrExit($$$$@)
</del><ins>+sub buildCMakeProjectOrExit($$$@)
</ins><span class="cx"> {
</span><del>- my ($clean, $port, $prefixPath, $makeArgs, @cmakeArgs) = @_;
</del><ins>+ my ($clean, $prefixPath, $makeArgs, @cmakeArgs) = @_;
</ins><span class="cx"> my $returnCode;
</span><span class="cx">
</span><span class="cx"> exit(exitStatus(cleanCMakeGeneratedProject())) if $clean;
</span><span class="lines">@@ -2046,7 +2046,7 @@
</span><span class="cx"> system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
</del><ins>+ $returnCode = exitStatus(generateBuildSystemFromCMakeProject($prefixPath, @cmakeArgs));
</ins><span class="cx"> exit($returnCode) if $returnCode;
</span><span class="cx">
</span><span class="cx"> $returnCode = exitStatus(buildCMakeGeneratedProject($makeArgs));
</span></span></pre>
</div>
</div>
</body>
</html>