<!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>[195759] 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/195759">195759</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-28 10:41:46 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use isAnyWindows() instead of isCygwin() || isWindows() in Perl scripts.
https://bugs.webkit.org/show_bug.cgi?id=153594
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-01-28
Reviewed by Alex Christensen.
* Scripts/webkitdirs.pm:
(determineNumberOfCPUs):
(jscPath):
(checkFrameworks):
(setupCygwinEnv):
(wrapperPrefixIfNeeded):
(cmakeGeneratedBuildfile):
(generateBuildSystemFromCMakeProject):
* Scripts/webkitperl/features.pm:
(libraryContainsSymbol):</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>
<li><a href="#trunkToolsScriptswebkitperlfeaturespm">trunk/Tools/Scripts/webkitperl/features.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195758 => 195759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-28 18:41:27 UTC (rev 195758)
+++ trunk/Tools/ChangeLog 2016-01-28 18:41:46 UTC (rev 195759)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-28 Konstantin Tokarev <annulen@yandex.ru>
+
+ Use isAnyWindows() instead of isCygwin() || isWindows() in Perl scripts.
+ https://bugs.webkit.org/show_bug.cgi?id=153594
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/webkitdirs.pm:
+ (determineNumberOfCPUs):
+ (jscPath):
+ (checkFrameworks):
+ (setupCygwinEnv):
+ (wrapperPrefixIfNeeded):
+ (cmakeGeneratedBuildfile):
+ (generateBuildSystemFromCMakeProject):
+ * Scripts/webkitperl/features.pm:
+ (libraryContainsSymbol):
+
</ins><span class="cx"> 2016-01-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r195742.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (195758 => 195759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 18:41:27 UTC (rev 195758)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 18:41:46 UTC (rev 195759)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> if ($numberOfCPUs eq "") {
</span><span class="cx"> $numberOfCPUs = (grep /processor/, `cat /proc/cpuinfo`);
</span><span class="cx"> }
</span><del>- } elsif (isWindows() || isCygwin()) {
</del><ins>+ } elsif (isAnyWindows()) {
</ins><span class="cx"> # Assumes cygwin
</span><span class="cx"> $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
</span><span class="cx"> } elsif (isDarwin() || isBSD()) {
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> my ($productDir) = @_;
</span><span class="cx"> my $jscName = "jsc";
</span><span class="cx"> $jscName .= "_debug" if configuration() eq "Debug_All";
</span><del>- $jscName .= ".exe" if (isWindows() || isCygwin());
</del><ins>+ $jscName .= ".exe" if (isAnyWindows());
</ins><span class="cx"> return "$productDir/$jscName" if -e "$productDir/$jscName";
</span><span class="cx"> return "$productDir/JavaScriptCore.framework/Resources/$jscName";
</span><span class="cx"> }
</span><span class="lines">@@ -929,7 +929,7 @@
</span><span class="cx"> # Check to see that all the frameworks are built.
</span><span class="cx"> sub checkFrameworks # FIXME: This is a poor name since only the Mac calls built WebCore a Framework.
</span><span class="cx"> {
</span><del>- return if isCygwin() || isWindows();
</del><ins>+ return if isAnyWindows();
</ins><span class="cx"> my @frameworks = ("JavaScriptCore", "WebCore");
</span><span class="cx"> push(@frameworks, "WebKit") if isAppleMacWebKit(); # FIXME: This seems wrong, all ports should have a WebKit these days.
</span><span class="cx"> for my $framework (@frameworks) {
</span><span class="lines">@@ -1641,7 +1641,7 @@
</span><span class="cx">
</span><span class="cx"> sub setupCygwinEnv()
</span><span class="cx"> {
</span><del>- return if !isCygwin() && !isWindows();
</del><ins>+ return if !isAnyWindows();
</ins><span class="cx"> return if $vcBuildPath;
</span><span class="cx">
</span><span class="cx"> my $programFilesPath = programFilesPath();
</span><span class="lines">@@ -1810,7 +1810,7 @@
</span><span class="cx">
</span><span class="cx"> sub wrapperPrefixIfNeeded()
</span><span class="cx"> {
</span><del>- if (isWindows() || isCygwin()) {
</del><ins>+ if (isAnyWindows()) {
</ins><span class="cx"> return ();
</span><span class="cx"> }
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="lines">@@ -1919,7 +1919,7 @@
</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><del>- } elsif (isWindows() || isCygwin()) {
</del><ins>+ } elsif (isAnyWindows()) {
</ins><span class="cx"> return File::Spec->catfile(baseProductDir(), configuration(), "WebKit.sln")
</span><span class="cx"> } else {
</span><span class="cx"> return File::Spec->catfile(baseProductDir(), configuration(), "Makefile")
</span><span class="lines">@@ -1977,7 +1977,7 @@
</span><span class="cx"> # Compiler options to keep floating point values consistent
</span><span class="cx"> # between 32-bit and 64-bit architectures.
</span><span class="cx"> determineArchitecture();
</span><del>- if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isWindows() && !isCygwin()) {
</del><ins>+ if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
</ins><span class="cx"> $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlfeaturespm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/features.pm (195758 => 195759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/features.pm 2016-01-28 18:41:27 UTC (rev 195758)
+++ trunk/Tools/Scripts/webkitperl/features.pm 2016-01-28 18:41:46 UTC (rev 195759)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($path, $symbol) = @_;
</span><span class="cx">
</span><del>- if (isCygwin() or isWindows()) {
</del><ins>+ if (isAnyWindows()) {
</ins><span class="cx"> # FIXME: Implement this for Windows.
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>