Modified: trunk/Tools/ChangeLog (164249 => 164250)
--- trunk/Tools/ChangeLog 2014-02-17 22:26:54 UTC (rev 164249)
+++ trunk/Tools/ChangeLog 2014-02-17 22:44:24 UTC (rev 164250)
@@ -1,3 +1,13 @@
+2014-02-17 Brent Fulgham <[email protected]>
+
+ [Win] There's another Windows SDK. Make sure we recognize it.
+ https://bugs.webkit.org/show_bug.cgi?id=128932
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort._ntsd_location):
+
2014-02-17 Ryosuke Niwa <[email protected]>
webkitpy test fix on Mac after r164244.
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (164249 => 164250)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2014-02-17 22:26:54 UTC (rev 164249)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2014-02-17 22:44:24 UTC (rev 164250)
@@ -140,7 +140,9 @@
def _ntsd_location(self):
if 'PROGRAMFILES' not in os.environ:
return None
- possible_paths = [self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x86", "ntsd.exe"),
+ possible_paths = [self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.1", "Debuggers", "x86", "ntsd.exe"),
+ self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.1", "Debuggers", "x64", "ntsd.exe"),
+ self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x86", "ntsd.exe"),
self._filesystem.join(os.environ['PROGRAMFILES'], "Windows Kits", "8.0", "Debuggers", "x64", "ntsd.exe"),
self._filesystem.join(os.environ['PROGRAMFILES'], "Debugging Tools for Windows (x86)", "ntsd.exe"),
self._filesystem.join(os.environ['ProgramW6432'], "Debugging Tools for Windows (x64)", "ntsd.exe"),
