<!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>[189973] 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/189973">189973</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-09-18 11:00:32 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent build-webkit from building four times on Windows
https://bugs.webkit.org/show_bug.cgi?id=149336
Reviewed by Brent Fulgham.
* Scripts/build-webkit:
Move the Windows code out of the for loop iterating over each subdirectory to be build.
They're built all at once.
* Scripts/webkitdirs.pm:
(buildVisualStudioProject):
(cmakeGeneratedBuildfile):
Don't generate the Visual Studio solution if it already exists.
It will run CMake again if necessary.</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 (189972 => 189973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-18 18:00:16 UTC (rev 189972)
+++ trunk/Tools/ChangeLog 2015-09-18 18:00:32 UTC (rev 189973)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-18 Alex Christensen <achristensen@webkit.org>
+
+ Prevent build-webkit from building four times on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=149336
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/build-webkit:
+ Move the Windows code out of the for loop iterating over each subdirectory to be build.
+ They're built all at once.
+ * Scripts/webkitdirs.pm:
+ (buildVisualStudioProject):
+ (cmakeGeneratedBuildfile):
+ Don't generate the Visual Studio solution if it already exists.
+ It will run CMake again if necessary.
+
</ins><span class="cx"> 2015-09-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] WTR fails to set the key window in the UIKit sense
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (189972 => 189973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-09-18 18:00:16 UTC (rev 189972)
+++ trunk/Tools/Scripts/build-webkit 2015-09-18 18:00:32 UTC (rev 189973)
</span><span class="lines">@@ -241,34 +241,19 @@
</span><span class="cx"> buildCMakeProjectOrExit($clean, cmakeBasedPortName(), $prefixPath, $makeArgs, (cmakeBasedPortArguments(), @featureArgs), $cmakeArgs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Build, and abort if the build fails.
-for my $dir (@projects) {
- chdir $dir or die;
- $result = 0;
-
- my $project = basename($dir);
- my $baseProductDir = baseProductDir();
- if (isAppleMacWebKit()) {
- my @local_options = @options;
- push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
- push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
- my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
- $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
- } elsif (isAppleWinWebKit() || isWinCairo()) {
- chdirWebKit();
- if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
- die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
- }
- if (canUseNinja()) {
- chdir "WebKitBuild/" . configuration();
- $result = system("ninja");
- } else {
- $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
- }
</del><ins>+my $baseProductDir = baseProductDir();
+if (isAppleWinWebKit() || isWinCairo()) {
+ chdirWebKit();
+ if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
+ die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
</ins><span class="cx"> }
</span><del>- # Various build* calls above may change the CWD.
</del><span class="cx"> chdirWebKit();
</span><del>-
</del><ins>+ if (canUseNinja()) {
+ chdir "WebKitBuild/" . configuration();
+ $result = system("ninja");
+ } else {
+ $result = buildVisualStudioProject("WebKitBuild/" . configuration() . "/WebKit.sln", $clean);
+ }
</ins><span class="cx"> if (exitStatus($result)) {
</span><span class="cx"> my $scriptDir = relativeScriptsDir();
</span><span class="cx"> if (isAppleWinWebKit() || isWinCairo()) {
</span><span class="lines">@@ -278,6 +263,27 @@
</span><span class="cx"> }
</span><span class="cx"> exit exitStatus($result);
</span><span class="cx"> }
</span><ins>+} elsif (isAppleMacWebKit()) {
+ # Build, and abort if the build fails.
+ for my $dir (@projects) {
+ chdir $dir or die;
+ $result = 0;
+
+ my $project = basename($dir);
+
+ my @local_options = @options;
+ push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
+ push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
+ my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
+ $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
+
+ # Various build* calls above may change the CWD.
+ chdirWebKit();
+
+ if (exitStatus($result)) {
+ exit exitStatus($result);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Don't report the "WebKit is now built" message after a clean operation.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (189972 => 189973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-09-18 18:00:16 UTC (rev 189972)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-09-18 18:00:32 UTC (rev 189973)
</span><span class="lines">@@ -1678,7 +1678,6 @@
</span><span class="cx"> my $warningLogging = "/flp1:LogFile=" . $warningLogFile . ";WarningsOnly";
</span><span class="cx">
</span><span class="cx"> my @command = ($vcBuildPath, "/verbosity:minimal", $project, $action, $config, $platform, "/fl", $errorLogging, "/fl1", $warningLogging);
</span><del>-
</del><span class="cx"> print join(" ", @command), "\n";
</span><span class="cx"> return system @command;
</span><span class="cx"> }
</span><span class="lines">@@ -1812,6 +1811,8 @@
</span><span class="cx"> my ($willUseNinja) = @_;
</span><span class="cx"> if ($willUseNinja) {
</span><span class="cx"> return File::Spec->catfile(baseProductDir(), configuration(), "build.ninja")
</span><ins>+ } elsif (isWindows() || isCygwin()) {
+ return File::Spec->catfile(baseProductDir(), configuration(), "WebKit.sln")
</ins><span class="cx"> } else {
</span><span class="cx"> return File::Spec->catfile(baseProductDir(), configuration(), "Makefile")
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>