<!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>[165649] 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/165649">165649</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-14 14:20:34 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Recognize openbsd/netbsd and am64 archs in Tools/Scripts.
Also allow to set MAKE in the environment.
https://bugs.webkit.org/show_bug.cgi?id=129991
Patch by Landry Breuil <landry@openbsd.org> on 2014-03-14
Reviewed by Andreas Kling.
* Scripts/webkitdirs.pm:
(determineArchitecture):
(determineNumberOfCPUs):
(isBSD):
(buildAutotoolsProject):
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.__init__):
(PlatformInfo.is_openbsd):
(PlatformInfo):
(PlatformInfo.is_netbsd):
(PlatformInfo._determine_os_name):</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="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165648 => 165649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-14 21:20:11 UTC (rev 165648)
+++ trunk/Tools/ChangeLog 2014-03-14 21:20:34 UTC (rev 165649)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-14 Landry Breuil <landry@openbsd.org>
+
+ Recognize openbsd/netbsd and am64 archs in Tools/Scripts.
+ Also allow to set MAKE in the environment.
+ https://bugs.webkit.org/show_bug.cgi?id=129991
+
+ Reviewed by Andreas Kling.
+
+ * Scripts/webkitdirs.pm:
+ (determineArchitecture):
+ (determineNumberOfCPUs):
+ (isBSD):
+ (buildAutotoolsProject):
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo.__init__):
+ (PlatformInfo.is_openbsd):
+ (PlatformInfo):
+ (PlatformInfo.is_netbsd):
+ (PlatformInfo._determine_os_name):
+
</ins><span class="cx"> 2014-03-14 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove libWebKitSystemInterfaceLion.a
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (165648 => 165649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-03-14 21:20:11 UTC (rev 165648)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-03-14 21:20:34 UTC (rev 165649)
</span><span class="lines">@@ -332,6 +332,8 @@
</span><span class="cx"> $architecture = `uname -m`;
</span><span class="cx"> chomp $architecture;
</span><span class="cx"> }
</span><ins>+
+ $architecture = 'x86_64' if ($architecture =~ /amd64/ && isBSD());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineNumberOfCPUs
</span><span class="lines">@@ -349,7 +351,7 @@
</span><span class="cx"> } elsif (isWindows() || isCygwin()) {
</span><span class="cx"> # Assumes cygwin
</span><span class="cx"> $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
</span><del>- } elsif (isDarwin() || isFreeBSD()) {
</del><ins>+ } elsif (isDarwin() || isBSD()) {
</ins><span class="cx"> chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1083,9 +1085,9 @@
</span><span class="cx"> return ($^O eq "linux") || 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub isFreeBSD()
</del><ins>+sub isBSD()
</ins><span class="cx"> {
</span><del>- return ($^O eq "freebsd") || 0;
</del><ins>+ return ($^O eq "freebsd") || ($^O eq "openbsd") || ($^O eq "netbsd") || 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isARM()
</span><span class="lines">@@ -1782,7 +1784,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($project, $clean, $prefix, $makeArgs, $noWebKit1, $noWebKit2, @features) = @_;
</span><span class="cx">
</span><del>- my $make = 'make';
</del><ins>+ my $make = $ENV{'MAKE'} //= 'make';
</ins><span class="cx"> my $dir = productDir();
</span><span class="cx"> my $config = passedConfiguration() || configuration();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (165648 => 165649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2014-03-14 21:20:11 UTC (rev 165648)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2014-03-14 21:20:34 UTC (rev 165649)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> self.os_name = self._determine_os_name(sys_module.platform)
</span><span class="cx"> if self.os_name == 'linux':
</span><span class="cx"> self.os_version = self._determine_linux_version()
</span><del>- if self.os_name == 'freebsd':
</del><ins>+ if self.os_name == 'freebsd' or self.os_name == 'openbsd' or self.os_name == 'netbsd':
</ins><span class="cx"> self.os_version = platform_module.release()
</span><span class="cx"> if self.os_name.startswith('mac'):
</span><span class="cx"> self.os_version = self._determine_mac_version(platform_module.mac_ver()[0])
</span><span class="lines">@@ -72,6 +72,12 @@
</span><span class="cx"> def is_freebsd(self):
</span><span class="cx"> return self.os_name == 'freebsd'
</span><span class="cx">
</span><ins>+ def is_openbsd(self):
+ return self.os_name == 'openbsd'
+
+ def is_netbsd(self):
+ return self.os_name == 'netbsd'
+
</ins><span class="cx"> def display_name(self):
</span><span class="cx"> # platform.platform() returns Darwin information for Mac, which is just confusing.
</span><span class="cx"> if self.is_mac():
</span><span class="lines">@@ -121,6 +127,8 @@
</span><span class="cx"> return 'win'
</span><span class="cx"> if sys_platform.startswith('freebsd'):
</span><span class="cx"> return 'freebsd'
</span><ins>+ if sys_platform.startswith('openbsd'):
+ return 'openbsd'
</ins><span class="cx"> raise AssertionError('unrecognized platform string "%s"' % sys_platform)
</span><span class="cx">
</span><span class="cx"> def _determine_mac_version(self, mac_version_string):
</span></span></pre>
</div>
</div>
</body>
</html>