From 5328ded2a66702cd037091bfca9b44f623985b05 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 15 Apr 2020 16:39:02 -0700 Subject: [PATCH] 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: https://github.com/emscripten-core/emscripten/issues/9543 --- emsdk.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/emsdk.py b/emsdk.py index 04a33aa92b..5bf16465ed 100755 --- a/emsdk.py +++ b/emsdk.py @@ -2760,15 +2760,15 @@ def main(): if WINDOWS: print(''' - emsdk activate [--global] [--embedded] [--build=type] [--vs2017/--vs2019] + emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2017/--vs2019] - 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 @@ -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] + print(''' emsdk activate [--[no-]embedded] [--build=type] - 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 @@ -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