FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2025-01-23 08:50:16 +01:00
Code Issues Projects Releases Wiki Activity

Detect MSVS 15.0 Installation path (via vswhere)

Browse Source 
Fixes: #1924

Inspired by the scripts from https://github.com/node4good/msvs-com-helper
This commit is contained in:
Refael Ackermann 2017-04-21 20:03:37 -04:00 committed by ita1024
parent 7142640257
commit e19d9d990f
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
waflib/Tools/msvc.py
View File

@ -430,6 +430,32 @@ def gather_winphone_targets(conf, versions, version, vc_path, vsvars):
if targets:
versions['winphone ' + version] = targets
@conf
def gather_vswhere_versions(conf, versions):
prg_path = os.environ.get('ProgramFiles(x86)', os.environ.get('ProgramFiles', ''))
vswhere = os.path.join(prg_path, 'Microsoft Visual Studio', 'Installer', 'vswhere.exe')
if not os.path.exists(vswhere):
return None
args = [vswhere,
'-latest',
'-products', '*',
'-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64']
try:
inst_path_lines = conf.cmd_and_log(args).splitlines()
ver = None
vc_path = None
for line in inst_path_lines:
parts = line.split(': ', 1)
if len(parts) == 2:
if parts[0] == 'installationPath': vc_path = os.path.abspath(parts[1])
if parts[0] == 'installationVersion': ver = parts[1]
if ver and vc_path and os.path.exists(vc_path):
version = '.'.join(ver.split('.')[:2])
conf.gather_msvc_targets(versions, version, vc_path)
except Exception as e:
Logs.debug('msvc: gather_vswhere_versions: failure %s', str(e))
@conf
def gather_msvc_versions(conf, versions):
vc_paths = []
@ -611,6 +637,7 @@ def get_msvc_versions(self):
self.gather_intel_composer_versions(dct)
self.gather_wsdk_versions(dct)
self.gather_msvc_versions(dct)
self.gather_vswhere_versions(dct)
Logs.debug('msvc: detected versions %r', list(dct.keys()))
return dct