Changeset 84372 in webkit

Timestamp:

Apr 20, 2011 7:44:05 AM (13 years ago)

Author:

Adam Roben

Message:

Teach webkitdirs::winVersion about build numbers

The build number isn't currently used, but soon will be.

As a bonus, winVersion now works on non-Cygwin variants of Perl!

Fixes <​http://webkit.org/b/58991> Need a way to distinguish between Windows 7 and Windows 7
SP1

Reviewed by Anders Carlsson.

• Scripts/webkitdirs.pm:

(isAnyWindows): Added. Returns true if we're running on any Windows-ish Perl.
(determineWinVersion): Use cmd /c ver to get the version number, including the build
number. Parse the version number into a hash, similar to how osXVersion() works.

(isWindows7):
(isWindowsVista):
(isWindowsXP):
Updated for changes to winVersion().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-20  Adam Roben  <aroben@apple.com>
+
+        Teach webkitdirs::winVersion about build numbers
+
+        The build number isn't currently used, but soon will be.
+
+        As a bonus, winVersion now works on non-Cygwin variants of Perl!
+
+        Fixes <http://webkit.org/b/58991> Need a way to distinguish between Windows 7 and Windows 7
+        SP1
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitdirs.pm:
+        (isAnyWindows): Added. Returns true if we're running on any Windows-ish Perl.
+        (determineWinVersion): Use `cmd /c ver` to get the version number, including the build
+        number. Parse the version number into a hash, similar to how osXVersion() works.
+
+        (isWindows7):
+        (isWindowsVista):
+        (isWindowsXP):
+        Updated for changes to winVersion().
+
 2011-04-20  W. James MacLean  <wjmaclean@chromium.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -889 +889 @@
 }
 
+sub isAnyWindows()
+{
+    return isWindows() || isCygwin() || isMsys();
+}
+
 sub determineWinVersion()
 {
     return if $winVersion;
 
-    if (!isCygwin()) {
+    if (!isAnyWindows()) {
         $winVersion = -1;
         return;
     }
 
-    my $versionString = `uname -s`;
-    $versionString =~ /(\d\.\d)/;
-    $winVersion = $1;
+    my $versionString = `cmd /c ver`;
+    $versionString =~ /(\d)\.(\d)\.(\d+)/;
+
+    $winVersion = {
+        major => $1,
+        minor => $2,
+        build => $3,
+    };
 }
 
@@ -911 +921 @@
 sub isWindows7()
 {
-    return winVersion() eq "6.1";
+    return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1;
 }
 
 sub isWindowsVista()
 {
-    return winVersion() eq "6.0";
+    return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 0;
 }
 
 sub isWindowsXP()
 {
-    return winVersion() eq "5.1";
+    return isAnyWindows() && winVersion()->{major} == 5 && winVersion()->{minor} == 1;
 }