Skip to content

Commit 5328ded

Browse files
committed
Use embedded configuration by default
I can't see any reason why the embedded mode isn't always preferable. The emsdk is designed to be used as-is, and per-user customizations don't make sense. I'm hoping if this sicks we can just remove this options completely. This is part of a wider plan to remove the use of the user's HOME directory completely: emscripten-core/emscripten#9543
1 parent 5613488 commit 5328ded

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

emsdk.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2760,15 +2760,15 @@ def main():
27602760

27612761
if WINDOWS:
27622762
print('''
2763-
emsdk activate [--global] [--embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
2763+
emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
27642764
27652765
- Activates the given tool or SDK in the
27662766
environment of the current shell. If the
27672767
--global option is passed, the registration
27682768
is done globally to all users in the system
2769-
environment. If the --embedded option is
2770-
passed, all Emcripten configuration files as
2771-
well as the temp, cache and ports directories
2769+
environment. In embedded mode (the default)
2770+
all Emcripten configuration files as well as
2771+
the temp, cache and ports directories
27722772
are located inside the Emscripten SDK
27732773
directory rather than the user home
27742774
directory. If a custom compiler version was
@@ -2779,11 +2779,11 @@ def main():
27792779
emcmdprompt.bat - Spawns a new command prompt window with the
27802780
Emscripten environment active.''')
27812781
else:
2782-
print(''' emsdk activate [--embedded] [--build=type] <tool/sdk>
2782+
print(''' emsdk activate [--[no-]embedded] [--build=type] <tool/sdk>
27832783
27842784
- Activates the given tool or SDK in the
2785-
environment of the current shell. If the
2786-
--embedded option is passed, all Emcripten
2785+
environment of the current shell. In
2786+
embedded mode (the default), all Emcripten
27872787
configuration files as well as the temp, cache
27882788
and ports directories are located inside the
27892789
Emscripten SDK directory rather than the user
@@ -2810,6 +2810,7 @@ def extract_bool_arg(name):
28102810
arg_uses = extract_bool_arg('--uses')
28112811
arg_global = extract_bool_arg('--global')
28122812
arg_embedded = extract_bool_arg('--embedded')
2813+
arg_embedded = not extract_bool_arg('--no-embedded')
28132814
arg_notty = extract_bool_arg('--notty')
28142815
if arg_notty:
28152816
TTY_OUTPUT = False

0 commit comments

Comments
 (0)