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