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

Use embedded configuration by default (#472)

Browse Source 
This is part of a wider plan to remove the use of the user's HOME
directory completely:
  https://github.com/emscripten-core/emscripten/issues/9543
This commit is contained in:
Sam Clegg
2020-05-29 12:49:51 -04:00
committed by GitHub
parent 855c51d36d
commit 858b176f68
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
emsdk.py
View File

@@ -2760,15 +2760,15 @@ def main():
if WINDOWS: if WINDOWS:
print(''' print('''
emsdk activate [--global] [--embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk> emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
- Activates the given tool or SDK in the - Activates the given tool or SDK in the
environment of the current shell. If the environment of the current shell. If the
--global option is passed, the registration --global option is passed, the registration
is done globally to all users in the system is done globally to all users in the system
environment. If the --embedded option is environment. In embedded mode (the default)
passed, all Emcripten configuration files as all Emcripten configuration files as well as
well as the temp, cache and ports directories the temp, cache and ports directories
are located inside the Emscripten SDK are located inside the Emscripten SDK
directory rather than the user home directory rather than the user home
directory. If a custom compiler version was directory. If a custom compiler version was
@@ -2779,11 +2779,11 @@ def main():
emcmdprompt.bat - Spawns a new command prompt window with the emcmdprompt.bat - Spawns a new command prompt window with the
Emscripten environment active.''') Emscripten environment active.''')
else: else:
print(''' emsdk activate [--embedded] [--build=type] <tool/sdk> print(''' emsdk activate [--[no-]embedded] [--build=type] <tool/sdk>
- Activates the given tool or SDK in the - Activates the given tool or SDK in the
environment of the current shell. If the environment of the current shell. In
--embedded option is passed, all Emcripten embedded mode (the default), all Emcripten
configuration files as well as the temp, cache configuration files as well as the temp, cache
and ports directories are located inside the and ports directories are located inside the
Emscripten SDK directory rather than the user Emscripten SDK directory rather than the user
@@ -2810,6 +2810,7 @@ def main():
arg_uses = extract_bool_arg('--uses') arg_uses = extract_bool_arg('--uses')
arg_global = extract_bool_arg('--global') arg_global = extract_bool_arg('--global')
arg_embedded = extract_bool_arg('--embedded') arg_embedded = extract_bool_arg('--embedded')
arg_embedded = not extract_bool_arg('--no-embedded')
arg_notty = extract_bool_arg('--notty') arg_notty = extract_bool_arg('--notty')
if arg_notty: if arg_notty:
TTY_OUTPUT = False TTY_OUTPUT = False