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

Properly check for existence of environment variable keys in a manner that does not throw. Fixes https://github.com/juj/emsdk/issues/2 .

Browse Source
This commit is contained in:
Jukka Jylänki
2013-11-22 11:16:31 +02:00
parent fab972f06c
commit f9a46a2927
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
emsdk
View File

@@ -388,11 +388,13 @@ JS_ENGINES = [NODE_JS]
print ' ' + ENVPATH_SEPARATOR.join(path_add)
def find_msbuild_dir():
program_files = os.environ['ProgramFiles']
if not program_files:
if 'ProgramFiles' in os.environ and os.environ['ProgramFiles']:
program_files = os.environ['ProgramFiles']
else:
program_files = 'C:/Program Files'
program_files_x86 = os.environ['ProgramFiles(x86)']
if not program_files_x86:
if 'ProgramFiles(x86)' in os.environ and os.environ['ProgramFiles(x86)']:
program_files_x86 = os.environ['ProgramFiles(x86)']
else:
program_files_x86 = 'C:/Program Files (x86)'
MSBUILDX86_DIR = os.path.join(program_files_x86, "MSBuild/Microsoft.Cpp/v4.0/Platforms")
MSBUILD_DIR = os.path.join(program_files, "MSBuild/Microsoft.Cpp/v4.0/Platforms")