<!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>[190424] 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/190424">190424</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-10-01 12:38:49 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Fix behavior of webkit-build-directory script
https://bugs.webkit.org/show_bug.cgi?id=149718
Reviewed by Alex Christensen.
* Scripts/webkitdirs.pm:
(determineConfigurationProductDir): Do not include the binary
sub-directory in the configuration product directory output.
(jscProductDir): Append correct binary path for Windows build.
(setPathForRunningWebKitApp): Include properly binary subdirectories.
(runSafari): Update for revised productDir behavior.
(runMiniBrowser): 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190423 => 190424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-01 19:31:22 UTC (rev 190423)
+++ trunk/Tools/ChangeLog 2015-10-01 19:38:49 UTC (rev 190424)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Fix behavior of webkit-build-directory script
+ https://bugs.webkit.org/show_bug.cgi?id=149718
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/webkitdirs.pm:
+ (determineConfigurationProductDir): Do not include the binary
+ sub-directory in the configuration product directory output.
+ (jscProductDir): Append correct binary path for Windows build.
+ (setPathForRunningWebKitApp): Include properly binary subdirectories.
+ (runSafari): Update for revised productDir behavior.
+ (runMiniBrowser): Ditto.
+
</ins><span class="cx"> 2015-10-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop building LayoutTestRelay for now. It's a Mac project, but build-webkit tries to
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (190423 => 190424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-01 19:31:22 UTC (rev 190423)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-01 19:38:49 UTC (rev 190424)
</span><span class="lines">@@ -559,8 +559,7 @@
</span><span class="cx"> determineBaseProductDir();
</span><span class="cx"> determineConfiguration();
</span><span class="cx"> if (isAppleWinWebKit() || isWinCairo()) {
</span><del>- my $binDir = isWin64() ? "bin64" : "bin32";
- $configurationProductDir = File::Spec->catdir($baseProductDir, $configuration, $binDir);
</del><ins>+ $configurationProductDir = File::Spec->catdir($baseProductDir, $configuration);
</ins><span class="cx"> } else {
</span><span class="cx"> if (usesPerConfigurationBuildDirectory()) {
</span><span class="cx"> $configurationProductDir = "$baseProductDir";
</span><span class="lines">@@ -615,6 +614,10 @@
</span><span class="cx"> {
</span><span class="cx"> my $productDir = productDir();
</span><span class="cx"> $productDir .= "/bin" if (isEfl() || isGtk());
</span><ins>+ if (isAnyWindows()) {
+ my $binDir = isWin64() ? "bin64" : "bin32";
+ $productDir = File::Spec->catdir($productDir, $binDir);
+ }
</ins><span class="cx">
</span><span class="cx"> return $productDir;
</span><span class="cx"> }
</span><span class="lines">@@ -1995,12 +1998,16 @@
</span><span class="cx"> {
</span><span class="cx"> my ($env) = @_;
</span><span class="cx">
</span><del>- if (isAppleWinWebKit()) {
- $env->{PATH} = join(':', productDir(), appleApplicationSupportPath(), $env->{PATH} || "");
- } elsif (isWinCairo()) {
- my $winCairoBin = sourceDir() . "/WebKitLibraries/win/" . (isWin64() ? "bin64/" : "bin32/");
- my $gstreamerBin = isWin64() ? $ENV{"GSTREAMER_1_0_ROOT_X86_64"} . "bin" : $ENV{"GSTREAMER_1_0_ROOT_X86"} . "bin";
- $env->{PATH} = join(':', productDir(), $winCairoBin, $gstreamerBin, $env->{PATH} || "");
</del><ins>+ if (isAnyWindows()) {
+ my $binDir = isWin64() ? "bin64" : "bin32";
+ my $productBinaryDir = File::Spec->catdir(productDir(), $binDir);
+ if (isAppleWinWebKit()) {
+ $env->{PATH} = join(':', $productBinaryDir, appleApplicationSupportPath(), $env->{PATH} || "");
+ } elsif (isWinCairo()) {
+ my $winCairoBin = sourceDir() . "/WebKitLibraries/win/" . (isWin64() ? "bin64/" : "bin32/");
+ my $gstreamerBin = isWin64() ? $ENV{"GSTREAMER_1_0_ROOT_X86_64"} . "bin" : $ENV{"GSTREAMER_1_0_ROOT_X86"} . "bin";
+ $env->{PATH} = join(':', $productBinaryDir, $winCairoBin, $gstreamerBin, $env->{PATH} || "");
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2401,7 +2408,8 @@
</span><span class="cx"> if (isAppleWinWebKit()) {
</span><span class="cx"> my $result;
</span><span class="cx"> my $productDir = productDir();
</span><del>- my $webKitLauncherPath = File::Spec->catfile(productDir(), "WinLauncher.exe");
</del><ins>+ my $binDir = isWin64() ? "bin64" : "bin32";
+ my $webKitLauncherPath = File::Spec->catfile(productDir(), $binDir, "MiniBrowser.exe");
</ins><span class="cx"> return system { $webKitLauncherPath } $webKitLauncherPath, @ARGV;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2412,6 +2420,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="cx"> return runMacWebKitApp(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
</span><ins>+ } elsif (isAppleWinWebKit()) {
+ my $result;
+ my $productDir = productDir();
+ my $binDir = isWin64() ? "bin64" : "bin32";
+ my $webKitLauncherPath = File::Spec->catfile(productDir(), $binDir, "MiniBrowser.exe");
+ return system { $webKitLauncherPath } $webKitLauncherPath, @ARGV;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 1;
</span></span></pre>
</div>
</div>
</body>
</html>