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

Add suggestion to install using --permanent or --system on windows. NFC (#1308)

Browse Source 
Fixes: #1307
This commit is contained in:
Sam Clegg
2023-12-04 09:26:53 -08:00
committed by GitHub
parent b54a6b662f
commit ef77dcc2c0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
emsdk.py
View File

@@ -1508,7 +1508,7 @@ def load_em_config():
pass pass
def generate_em_config(active_tools): def generate_em_config(active_tools, permanently_activate, system):
cfg = 'import os\n' cfg = 'import os\n'
cfg += "emsdk_path = os.path.dirname(os.getenv('EM_CONFIG')).replace('\\\\', '/')\n" cfg += "emsdk_path = os.path.dirname(os.getenv('EM_CONFIG')).replace('\\\\', '/')\n"
@@ -1546,7 +1546,14 @@ JS_ENGINES = [NODE_JS]
rmfile(os.path.join(EMSDK_PATH, ".emscripten_sanity")) rmfile(os.path.join(EMSDK_PATH, ".emscripten_sanity"))
path_add = get_required_path(active_tools) path_add = get_required_path(active_tools)
if not WINDOWS:
# Give some recommended next step, depending on the platform
if WINDOWS:
if not permanently_activate and not system:
print('Next steps:')
print('- Consider running `emsdk activate` with --permanent or --system')
print(' to have emsdk settings available on startup.')
else:
emsdk_env = sdk_path('emsdk_env.sh') emsdk_env = sdk_path('emsdk_env.sh')
print('Next steps:') print('Next steps:')
print('- To conveniently access emsdk tools from the command line,') print('- To conveniently access emsdk tools from the command line,')
@@ -2413,7 +2420,7 @@ def set_active_tools(tools_to_activate, permanently_activate, system):
print('Setting the following tools as active:\n ' + '\n '.join(map(lambda x: str(x), tools))) print('Setting the following tools as active:\n ' + '\n '.join(map(lambda x: str(x), tools)))
print('') print('')
generate_em_config(tools_to_activate) generate_em_config(tools_to_activate, permanently_activate, system)
# Construct a .bat or .ps1 script that will be invoked to set env. vars and PATH # Construct a .bat or .ps1 script that will be invoked to set env. vars and PATH
# We only do this on cmd or powershell since emsdk.bat/ps1 is able to modify the # We only do this on cmd or powershell since emsdk.bat/ps1 is able to modify the