Changeset 195759 in webkit

Timestamp:

Jan 28, 2016 10:41:46 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Use isAnyWindows() instead of isCygwin()

isWindows() in Perl scripts.

​https://bugs.webkit.org/show_bug.cgi?id=153594

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-01-28
Reviewed by Alex Christensen.

• Scripts/webkitdirs.pm:

(determineNumberOfCPUs):
(jscPath):
(checkFrameworks):
(setupCygwinEnv):
(wrapperPrefixIfNeeded):
(cmakeGeneratedBuildfile):
(generateBuildSystemFromCMakeProject):

• Scripts/webkitperl/features.pm:

(libraryContainsSymbol):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (7 diffs)
• Scripts/webkitperl/features.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2016-01-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -397 +397 @@
             $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`;
@@ -418 +418 @@
     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/JavaScriptCore.framework/Resources/$jscName";
@@ -930 +930 @@
 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 = ("JavaScriptCore", "WebCore");
     push(@frameworks, "WebKit") if isAppleMacWebKit(); # FIXME: This seems wrong, all ports should have a WebKit these days.
@@ -1642 +1642 @@
 sub setupCygwinEnv()
 {
-    return if !isCygwin() && !isWindows();
+    return if !isAnyWindows();
     return if $vcBuildPath;
 
@@ -1811 +1811 @@
 sub wrapperPrefixIfNeeded()
 {
-    if (isWindows() || isCygwin()) {
+    if (isAnyWindows()) {
         return ();
     }
@@ -1920 +1920 @@
     if ($willUseNinja) {
         return File::Spec->catfile(baseProductDir(), configuration(), "build.ninja")
-    } elsif (isWindows() || isCygwin()) {
+    } elsif (isAnyWindows()) {
         return File::Spec->catfile(baseProductDir(), configuration(), "WebKit.sln")
     } else {
@@ -1978 +1978 @@
     # 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'} || "");
     }

trunk/Tools/Scripts/webkitperl/features.pm

@@ -50 +50 @@
     my ($path, $symbol) = @_;
 
-    if (isCygwin() or isWindows()) {
+    if (isAnyWindows()) {
         # FIXME: Implement this for Windows.
         return 0;