[Win] Unreviewed build fix: Recognize Windows 10 variants.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Dec 2015 22:26:40 +0000 (22:26 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Dec 2015 22:26:40 +0000 (22:26 +0000)
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo._determine_win_version):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/common/system/platforminfo.py

index 80e11d1..38bc9fb 100644 (file)
@@ -1,3 +1,10 @@
+2015-12-23  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Unreviewed build fix: Recognize Windows 10 variants.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo._determine_win_version):
+
 2015-12-23  Chris Aljoudi <chris@chrismatic.io> and Alex Christensen <achristensen@webkit.org>
 
         Content blockers should be able to promote http to https
index 69d7b33..475653d 100644 (file)
@@ -166,8 +166,9 @@ class PlatformInfo(object):
         return 'lucid'
 
     def _determine_win_version(self, win_version_tuple):
-        if win_version_tuple[:3] == (0, 0, 10240):
-            return 'win10'
+        if win_version_tuple[:2] == (0, 0):
+            if win_version_tuple[2] > 10000:
+                return 'win10'
         if win_version_tuple[:3] == (6, 1, 7600):
             return '7sp0'
         if win_version_tuple[:2] == (6, 0):