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

Author: sbc100

.circleci/config.yml

@@ -36,7 +36,9 @@ jobs:
           name: Install debian packages
           command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless
       - run: ./test.sh
-      - run: ./test.py
+      - run: |
+         - source emsdk_env.sh
+         - ./test.py
   test-mac:
     macos:
       xcode: "9.0"
@@ -54,7 +56,9 @@ jobs:
           name: Install python 3
           command: brew install python3
       - run: ./test.sh
-      - run: ./test.py
+      - run: |
+         - source emsdk_env.sh
+         - ./test.py
   test-windows:
     executor:
       name: win/vs2019

emsdk.py

@@ -2793,15 +2793,15 @@ def main():
 
     if WINDOWS:
       print('''
-   emsdk activate [--global] [--embedded] [--build=type] [--vs2013/--vs2015/--vs2017] <tool/sdk>
+   emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2013/--vs2015/--vs2017] <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
@@ -2812,11 +2812,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
@@ -2843,6 +2843,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

test.py

@@ -9,15 +9,15 @@
 WINDOWS = sys.platform.startswith('win')
 MACOS = sys.platform == 'darwin'
 
+assert 'EM_CONFIG' in os.environ
+
 upstream_emcc = os.path.join('upstream', 'emscripten', 'emcc')
 fastcomp_emcc = os.path.join('fastcomp', 'emscripten', 'emcc')
 emsdk = './emsdk'
 if WINDOWS:
   upstream_emcc += '.bat'
   fastcomp_emcc += '.bat'
   emsdk = 'emsdk.bat'
-else:
-  emsdk = './emsdk'
 
 # Utilities
 
@@ -76,13 +76,13 @@ def hack_emsdk(marker, replacement):
 
 TAGS = json.loads(open('emscripten-releases-tags.txt').read())
 
-LIBC = os.path.expanduser('~/.emscripten_cache/wasm/libc.a')
+LIBC = '.emscripten_cache/wasm/libc.a'
 
 # Tests
 
 print('test .emscripten contents (latest was installed/activated in test.sh)')
-assert 'fastcomp' not in open(os.path.expanduser('~/.emscripten')).read()
-assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read()
+assert 'fastcomp' not in open('.emscripten').read()
+assert 'upstream' in open('.emscripten').read()
 
 # Test we don't re-download unnecessarily
 checked_call_with_output(emsdk + ' install latest', expected='already installed', unexpected='Downloading:')
@@ -134,9 +134,9 @@ def run_emsdk(cmd):
 run_emsdk('activate latest-fastcomp')
 
 test_lib_building(fastcomp_emcc, use_asmjs_optimizer=False)
-assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1
-assert 'upstream' not in open(os.path.expanduser('~/.emscripten')).read()
-assert 'fastcomp' in open(os.path.expanduser('~/.emscripten')).read()
+assert open('.emscripten').read().count('LLVM_ROOT') == 1
+assert 'upstream' not in open('.emscripten').read()
+assert 'fastcomp' in open('.emscripten').read()
 
 print('verify version')
 checked_call_with_output(fastcomp_emcc + ' -v', TAGS['latest'], stderr=subprocess.STDOUT)
@@ -154,9 +154,9 @@ def run_emsdk(cmd):
 print('test tot-upstream')
 run_emsdk('install tot-upstream')
 assert not os.path.exists(LIBC)
-old_config = open(os.path.expanduser('~/.emscripten')).read()
+old_config = open('.emscripten').read()
 run_emsdk('activate tot-upstream')
-assert old_config == open(os.path.expanduser('~/.emscripten.old')).read()
+assert old_config == open('.emscripten.old').read()
 # TODO; test on latest as well
 assert os.path.exists(LIBC), 'activation supplies prebuilt libc'
 check_call(upstream_emcc + ' hello_world.c')
@@ -175,8 +175,8 @@ def run_emsdk(cmd):
 print('another install, but no need for re-download')
 checked_call_with_output(emsdk + ' install 1.38.33', expected='Skipped', unexpected='Downloading:')
 run_emsdk('activate 1.38.33')
-assert 'upstream' not in open(os.path.expanduser('~/.emscripten')).read()
-assert 'fastcomp' in open(os.path.expanduser('~/.emscripten')).read()
+assert 'upstream' not in open('.emscripten').read()
+assert 'fastcomp' in open('.emscripten').read()
 
 print('test specific release (new, full name)')
 run_emsdk('install sdk-1.38.33-upstream-64bit')