Title: [165649] trunk/Tools
- Revision
- 165649
- Author
- [email protected]
- Date
- 2014-03-14 14:20:34 -0700 (Fri, 14 Mar 2014)
Log Message
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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165648 => 165649)
--- trunk/Tools/ChangeLog 2014-03-14 21:20:11 UTC (rev 165648)
+++ trunk/Tools/ChangeLog 2014-03-14 21:20:34 UTC (rev 165649)
@@ -1,3 +1,23 @@
+2014-03-14 Landry Breuil <[email protected]>
+
+ 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):
+
2014-03-14 Dean Jackson <[email protected]>
Remove libWebKitSystemInterfaceLion.a
Modified: trunk/Tools/Scripts/webkitdirs.pm (165648 => 165649)
--- 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)
@@ -332,6 +332,8 @@
$architecture = `uname -m`;
chomp $architecture;
}
+
+ $architecture = 'x86_64' if ($architecture =~ /amd64/ && isBSD());
}
sub determineNumberOfCPUs
@@ -349,7 +351,7 @@
} elsif (isWindows() || isCygwin()) {
# Assumes cygwin
$numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
- } elsif (isDarwin() || isFreeBSD()) {
+ } elsif (isDarwin() || isBSD()) {
chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
}
}
@@ -1083,9 +1085,9 @@
return ($^O eq "linux") || 0;
}
-sub isFreeBSD()
+sub isBSD()
{
- return ($^O eq "freebsd") || 0;
+ return ($^O eq "freebsd") || ($^O eq "openbsd") || ($^O eq "netbsd") || 0;
}
sub isARM()
@@ -1782,7 +1784,7 @@
{
my ($project, $clean, $prefix, $makeArgs, $noWebKit1, $noWebKit2, @features) = @_;
- my $make = 'make';
+ my $make = $ENV{'MAKE'} //= 'make';
my $dir = productDir();
my $config = passedConfiguration() || configuration();
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (165648 => 165649)
--- 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)
@@ -49,7 +49,7 @@
self.os_name = self._determine_os_name(sys_module.platform)
if self.os_name == 'linux':
self.os_version = self._determine_linux_version()
- if self.os_name == 'freebsd':
+ if self.os_name == 'freebsd' or self.os_name == 'openbsd' or self.os_name == 'netbsd':
self.os_version = platform_module.release()
if self.os_name.startswith('mac'):
self.os_version = self._determine_mac_version(platform_module.mac_ver()[0])
@@ -72,6 +72,12 @@
def is_freebsd(self):
return self.os_name == 'freebsd'
+ def is_openbsd(self):
+ return self.os_name == 'openbsd'
+
+ def is_netbsd(self):
+ return self.os_name == 'netbsd'
+
def display_name(self):
# platform.platform() returns Darwin information for Mac, which is just confusing.
if self.is_mac():
@@ -121,6 +127,8 @@
return 'win'
if sys_platform.startswith('freebsd'):
return 'freebsd'
+ if sys_platform.startswith('openbsd'):
+ return 'openbsd'
raise AssertionError('unrecognized platform string "%s"' % sys_platform)
def _determine_mac_version(self, mac_version_string):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
