Title: [194396] trunk/Tools
- Revision
- 194396
- Author
- [email protected]
- Date
- 2015-12-23 14:26:40 -0800 (Wed, 23 Dec 2015)
Log Message
[Win] Unreviewed build fix: Recognize Windows 10 variants.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo._determine_win_version):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (194395 => 194396)
--- trunk/Tools/ChangeLog 2015-12-23 21:50:47 UTC (rev 194395)
+++ trunk/Tools/ChangeLog 2015-12-23 22:26:40 UTC (rev 194396)
@@ -1,3 +1,10 @@
+2015-12-23 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix: Recognize Windows 10 variants.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._determine_win_version):
+
2015-12-23 Chris Aljoudi <[email protected]> and Alex Christensen <[email protected]>
Content blockers should be able to promote http to https
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (194395 => 194396)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-12-23 21:50:47 UTC (rev 194395)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-12-23 22:26:40 UTC (rev 194396)
@@ -166,8 +166,9 @@
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):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
