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

If win_get_environment_variable fails due to win32api module not being present, gracefully fail out. Recognise MINGW64 as an MSYSTEM, and behave like MSYS even when MSYSTEM is set, but is of another flavor. (even when untested)

Browse Source
This commit is contained in:
Jukkaj Jylanki
2018-04-17 16:09:25 +03:00
parent af66c0ce2f
commit 72f6f67ade
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emsdk
View File

@@ -40,9 +40,8 @@ if os.name == 'nt' or (os.getenv('SYSTEMROOT') != None and 'WINDOWS' in os.geten
MSYS = False MSYS = False
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
if os.getenv('MSYSTEM') == 'MSYS':
MSYS = True MSYS = True
else: if os.getenv('MSYSTEM') != 'MSYS' and os.getenv('MSYSTEM') != 'MINGW64':
print('Warning: MSYSTEM environment variable is present, and is set to "' + os.getenv('MSYSTEM') + '". This shell has not been tested with emsdk and may not work.') # https://stackoverflow.com/questions/37460073/msys-vs-mingw-internal-environment-variables print('Warning: MSYSTEM environment variable is present, and is set to "' + os.getenv('MSYSTEM') + '". This shell has not been tested with emsdk and may not work.') # https://stackoverflow.com/questions/37460073/msys-vs-mingw-internal-environment-variables
OSX = False OSX = False
@@ -219,7 +218,10 @@ def win_get_environment_variable(key, system=True):
if e[0] != 2: # 'The system cannot find the file specified.' if e[0] != 2: # 'The system cannot find the file specified.'
print('Failed to read environment variable ' + key + ':', file=sys.stderr) print('Failed to read environment variable ' + key + ':', file=sys.stderr)
print(str(e), file=sys.stderr) print(str(e), file=sys.stderr)
try:
win32api.RegCloseKey(folder) win32api.RegCloseKey(folder)
except Exception as e:
pass
os.environ['PATH'] = prev_path os.environ['PATH'] = prev_path
return None return None
win32api.RegCloseKey(folder) win32api.RegCloseKey(folder)