Skip to content

Commit ab49230

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 c523a65 commit ab49230

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
@@ -2793,15 +2793,15 @@ def main():
27932793

27942794
if WINDOWS:
27952795
print('''
2796-
emsdk activate [--global] [--embedded] [--build=type] [--vs2013/--vs2015/--vs2017] <tool/sdk>
2796+
emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2013/--vs2015/--vs2017] <tool/sdk>
27972797
27982798
- Activates the given tool or SDK in the
27992799
environment of the current shell. If the
28002800
--global option is passed, the registration
28012801
is done globally to all users in the system
2802-
environment. If the --embedded option is
2803-
passed, all Emcripten configuration files as
2804-
well as the temp, cache and ports directories
2802+
environment. In embedded mode (the default)
2803+
all Emcripten configuration files as well as
2804+
the temp, cache and ports directories
28052805
are located inside the Emscripten SDK
28062806
directory rather than the user home
28072807
directory. If a custom compiler version was
@@ -2812,11 +2812,11 @@ def main():
28122812
emcmdprompt.bat - Spawns a new command prompt window with the
28132813
Emscripten environment active.''')
28142814
else:
2815-
print(''' emsdk activate [--embedded] [--build=type] <tool/sdk>
2815+
print(''' emsdk activate [--[no-]embedded] [--build=type] <tool/sdk>
28162816
28172817
- Activates the given tool or SDK in the
2818-
environment of the current shell. If the
2819-
--embedded option is passed, all Emcripten
2818+
environment of the current shell. In
2819+
embedded mode (the default), all Emcripten
28202820
configuration files as well as the temp, cache
28212821
and ports directories are located inside the
28222822
Emscripten SDK directory rather than the user
@@ -2843,6 +2843,7 @@ def extract_bool_arg(name):
28432843
arg_uses = extract_bool_arg('--uses')
28442844
arg_global = extract_bool_arg('--global')
28452845
arg_embedded = extract_bool_arg('--embedded')
2846+
arg_embedded = not extract_bool_arg('--no-embedded')
28462847
arg_notty = extract_bool_arg('--notty')
28472848
if arg_notty:
28482849
TTY_OUTPUT = False

0 commit comments

Comments
 (0)