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

Fix running emsdk_env.sh outside of emsdk directory (#541)

Browse Source 
Fixes: #540
This commit is contained in:
Sam Clegg
2020-07-07 09:03:43 -07:00
committed by GitHub
parent 819e95cd99
commit 4f2daec074
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
emsdk.py
View File

@@ -170,10 +170,18 @@ emscripten_config_directory = os.path.expanduser("~/")
if os.path.exists(os.path.join(emsdk_path(), '.emscripten')): if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
emscripten_config_directory = emsdk_path() emscripten_config_directory = emsdk_path()
EMSDK_SET_ENV = 'emsdk_set_env.ps1' if POWERSHELL \
else 'emsdk_set_env.bat' if (WINDOWS and not MSYS) \ def get_set_env_script_name():
else 'emsdk_set_env.csh' if CSH \ if POWERSHELL:
else 'emsdk_set_env.sh' return 'emsdk_set_env.ps1'
if WINDOWS and not MSYS:
return 'emsdk_set_env.bat'
if CSH:
return 'emsdk_set_env.csh'
return 'emsdk_set_env.sh'
EMSDK_SET_ENV = os.path.join(emsdk_path(), get_set_env_script_name())
ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2') ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')