Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use embedded configuration by default #472

Merged
merged 1 commit into from
May 29, 2020
Merged

Use embedded configuration by default #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions emsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2760,15 +2760,15 @@ def main():

if WINDOWS:
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
environment of the current shell. If the
--global option is passed, the registration
is done globally to all users in the system
environment. If the --embedded option is
passed, all Emcripten configuration files as
well as the temp, cache and ports directories
environment. In embedded mode (the default)
all Emcripten configuration files as well as
the temp, cache and ports directories
are located inside the Emscripten SDK
directory rather than the user home
directory. If a custom compiler version was
Expand All @@ -2779,11 +2779,11 @@ def main():
emcmdprompt.bat - Spawns a new command prompt window with the
Emscripten environment active.''')
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
environment of the current shell. If the
--embedded option is passed, all Emcripten
environment of the current shell. In
embedded mode (the default), all Emcripten
configuration files as well as the temp, cache
and ports directories are located inside the
Emscripten SDK directory rather than the user
Expand All @@ -2810,6 +2810,7 @@ def extract_bool_arg(name):
arg_uses = extract_bool_arg('--uses')
arg_global = extract_bool_arg('--global')
arg_embedded = extract_bool_arg('--embedded')
arg_embedded = not extract_bool_arg('--no-embedded')
arg_notty = extract_bool_arg('--notty')
if arg_notty:
TTY_OUTPUT = False
Expand Down