Changeset 84372 in webkit
- Timestamp:
- Apr 20, 2011 7:44:05 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r84361 r84372 1 2011-04-20 Adam Roben <aroben@apple.com> 2 3 Teach webkitdirs::winVersion about build numbers 4 5 The build number isn't currently used, but soon will be. 6 7 As a bonus, winVersion now works on non-Cygwin variants of Perl! 8 9 Fixes <http://webkit.org/b/58991> Need a way to distinguish between Windows 7 and Windows 7 10 SP1 11 12 Reviewed by Anders Carlsson. 13 14 * Scripts/webkitdirs.pm: 15 (isAnyWindows): Added. Returns true if we're running on any Windows-ish Perl. 16 (determineWinVersion): Use `cmd /c ver` to get the version number, including the build 17 number. Parse the version number into a hash, similar to how osXVersion() works. 18 19 (isWindows7): 20 (isWindowsVista): 21 (isWindowsXP): 22 Updated for changes to winVersion(). 23 1 24 2011-04-20 W. James MacLean <wjmaclean@chromium.org> 2 25 -
trunk/Tools/Scripts/webkitdirs.pm
r83639 r84372 889 889 } 890 890 891 sub isAnyWindows() 892 { 893 return isWindows() || isCygwin() || isMsys(); 894 } 895 891 896 sub determineWinVersion() 892 897 { 893 898 return if $winVersion; 894 899 895 if (!is Cygwin()) {900 if (!isAnyWindows()) { 896 901 $winVersion = -1; 897 902 return; 898 903 } 899 904 900 my $versionString = `uname -s`; 901 $versionString =~ /(\d\.\d)/; 902 $winVersion = $1; 905 my $versionString = `cmd /c ver`; 906 $versionString =~ /(\d)\.(\d)\.(\d+)/; 907 908 $winVersion = { 909 major => $1, 910 minor => $2, 911 build => $3, 912 }; 903 913 } 904 914 … … 911 921 sub isWindows7() 912 922 { 913 return winVersion() eq "6.1";923 return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1; 914 924 } 915 925 916 926 sub isWindowsVista() 917 927 { 918 return winVersion() eq "6.0";928 return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 0; 919 929 } 920 930 921 931 sub isWindowsXP() 922 932 { 923 return winVersion() eq "5.1";933 return isAnyWindows() && winVersion()->{major} == 5 && winVersion()->{minor} == 1; 924 934 } 925 935
Note: See TracChangeset
for help on using the changeset viewer.