admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for building with Visual Studio 2017 Express (in x86 mode, as it looks like VS2017 Express only ships with partial x64 compiler support(?))

Browse Source
This commit is contained in:
Jukka Jylänki
2017-10-25 22:00:45 +03:00
parent 76aa7823f1
commit 00e8d9df95
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
emsdk
View File

@@ -114,19 +114,22 @@ def vswhere(version):
try: try:
program_files = os.environ['ProgramFiles(x86)'] if 'ProgramFiles(x86)' in os.environ else os.environ['ProgramFiles'] program_files = os.environ['ProgramFiles(x86)'] if 'ProgramFiles(x86)' in os.environ else os.environ['ProgramFiles']
vswhere_path = os.path.join(program_files, 'Microsoft Visual Studio', 'Installer', 'vswhere.exe') vswhere_path = os.path.join(program_files, 'Microsoft Visual Studio', 'Installer', 'vswhere.exe')
output = json.loads(subprocess.check_output([vswhere_path, '-latest', '-version', '[%s.0,%s.0)' % (version, version + 1) , '-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '-property', 'installationPath', '-format', 'json'])) output = json.loads(subprocess.check_output([vswhere_path, '-latest', '-version', '[%s.0,%s.0)' % (version, version + 1), '-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '-property', 'installationPath', '-format', 'json']))
# Visual Studio 2017 Express is not included in the above search, and it does not have the VC.Tools.x86.x64 tool, so do a catch-all attempt as a fallback, to detect Express version.
if len(output) == 0:
output = json.loads(subprocess.check_output([vswhere_path, '-latest', '-version', '[%s.0,%s.0)' % (version, version + 1), '-products', '*', '-property', 'installationPath', '-format', 'json']))
return output[0]['installationPath'].encode('ascii') if len(output) > 0 else '' return output[0]['installationPath'].encode('ascii') if len(output) > 0 else ''
except Exception as e: except Exception as e:
return '' return ''
def vs_filewhere(installation_path, platform, file): def vs_filewhere(installation_path, platform, file):
vcvarsall = os.path.join(installation_path, 'VC/Auxiliary/Build/vcvarsall.bat') try:
env = subprocess.check_output('cmd /c "%s" %s & where %s' % (vcvarsall, platform, file)) vcvarsall = os.path.join(installation_path, 'VC\\Auxiliary\\Build\\vcvarsall.bat')
paths = [path[:-len(file)] for path in env.split('\r\n') if path.endswith(file)] env = subprocess.check_output('cmd /c "%s" %s & where %s' % (vcvarsall, platform, file))
if (len(paths) > 0): paths = [path[:-len(file)] for path in env.split('\r\n') if path.endswith(file)]
return paths[0] return paths[0]
else: except Exception as e:
raise Exception('Cannot find the file in the given Visual Studio environment') return ''
CMAKE_GENERATOR = 'Unix Makefiles' CMAKE_GENERATOR = 'Unix Makefiles'
if WINDOWS: if WINDOWS: