From d938b4ea33f030d2e3ed5eedc6f356fa2a2994de Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 28 Aug 2017 22:57:06 +0200 Subject: [PATCH] return an error if no VS or MSVC is found --- gn/find_msvc_root.py | 10 ++++------ gn/find_windk.py | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gn/find_msvc_root.py b/gn/find_msvc_root.py index e795f8d..69a3a25 100644 --- a/gn/find_msvc_root.py +++ b/gn/find_msvc_root.py @@ -15,10 +15,8 @@ if msvc == 2015: print windk + '/VC' else: # get the first version - dir = os.listdir(windk + '/VC/Tools/MSVC/')[0] - if os.path.exists(dir): - print dir + root = windk + '/VC/Tools/MSVC/' + for vc_dir in os.listdir(root): + print root + vc_dir sys.exit(0) - # fallback to a version - vc_version = '14.11.25503' - print windk + '/VC/Tools/MSVC/' + vc_version + sys.exit(1) diff --git a/gn/find_windk.py b/gn/find_windk.py index d90a613..4489464 100644 --- a/gn/find_windk.py +++ b/gn/find_windk.py @@ -26,5 +26,4 @@ else: if os.path.exists(root + edition): print root + edition sys.exit(0) - # fall back to the "default" - print 'C:/Program Files (x86)/Microsoft Visual Studio/2017/' + editions[0] + sys.exit(1) -- 2.7.4