Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: build/vs_toolchain.py

Issue 2815873002: Get Chrome compiling on VS2017 Community edition (Closed)
Patch Set: Fix CC Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/vs_toolchain.py
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py
index 90a562d3fb67d17be366500ef264c5a588b0f67e..82ebedc99dfcdba8a2eb067cd3120bc3b091db59 100755
--- a/build/vs_toolchain.py
+++ b/build/vs_toolchain.py
@@ -150,10 +150,12 @@ def DetectVisualStudioPath():
# the registry. For details see:
# https://blogs.msdn.microsoft.com/heaths/2016/09/15/changes-to-visual-studio-15-setup/
# For now we use a hardcoded default with an environment variable override.
- path = r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional'
- path = os.environ.get('vs2017_install', path)
- if os.path.exists(path):
- return path
+ for path in (
+ os.environ.get('vs2017_install'),
+ r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional',
+ r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community'):
+ if path and os.path.exists(path):
+ return path
else:
keys = [r'HKLM\Software\Microsoft\VisualStudio\%s' % version,
r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\%s' % version]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698