r

.circleci/config.yml

@@ -34,16 +34,17 @@ jobs:
       - checkout
       - run:
           name: Install debian packages
-          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless
-      - run: scripts/test.sh
+          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
+      - run: test/test.sh
+      - run: test/test_source_env.sh
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            scripts/test.py
+            test/test.py
   test-mac:
     macos:
-      xcode: "9.0"
+      xcode: "12.2.0"
     environment:
       EMSDK_NOTTY: "1"
       # Without this, any `brew installl` command will result in self-update of
@@ -54,15 +55,12 @@ jobs:
       - run:
           name: Install cmake
           command: brew install cmake
-      - run:
-          name: Install python 3
-          command: brew install python3
-      - run: scripts/test.sh
+      - run: test/test.sh
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            scripts/test.py
+            test/test.py
   test-windows:
     executor:
       name: win/vs2019
@@ -83,12 +81,125 @@ jobs:
       - run:
           name: Install latest
           shell: cmd.exe
-          command: scripts\test.bat
+          command: test\test.bat
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            python scripts/test.py
+            python test/test.py
+
+      - run:
+          name: flagless (process/shell) test
+          shell: powershell.exe
+          command: |
+            test/test_activation.ps1
+
+      - run:
+          name: --permanent test
+          shell: powershell.exe
+          command: |
+            $env:PERMANENT_FLAG="--permanent"
+            test/test_activation.ps1
+
+      - run:
+          name: --system test
+          shell: powershell.exe
+          command: |
+            $env:SYSTEM_FLAG="--system"
+            test/test_activation.ps1
+
+      - run:
+          name: Process/Shell PATH preservation test
+          shell: powershell.exe
+          command: |
+            test/test_path_preservation.ps1
+
+      - run:
+          name: User PATH preservation test
+          shell: powershell.exe
+          command: |
+            $env:PERMANENT_FLAG="--permanent"
+            test/test_path_preservation.ps1
+
+      - run:
+          name: System PATH preservation test
+          shell: powershell.exe
+          command: |
+            $env:SYSTEM_FLAG="--system"
+            test/test_path_preservation.ps1
+
+  build-docker-image:
+    executor: bionic
+    steps:
+      - checkout
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker:
+          version: 19.03.13
+      # Build and test the tip-of-tree build of EMSDK
+      - run:
+          name: build
+          command: make -C ./docker version=tot build
+      - run:
+          name: test
+          command: make -C ./docker version=tot test
+
+  publish-docker-image:
+    executor: bionic
+    steps:
+      - checkout
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker:
+          version: 19.03.13
+      - run:
+          name: build
+          command: make -C ./docker version=${CIRCLE_TAG} build
+      - run:
+          name: test
+          command: make -C ./docker version=${CIRCLE_TAG} test
+      - run:
+          name: push image
+          command: |
+            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+            make -C ./docker version=${CIRCLE_TAG} alias=latest push
+
+  test-bazel-linux:
+    executor: bionic
+    steps:
+      - checkout
+      - run: apt-get install -q -y curl gnupg
+      - run: curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
+      - run: mv bazel.gpg /etc/apt/trusted.gpg.d/
+      - run: echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+      - run:
+          name: install pip
+          command: |
+            apt-get update -q
+            apt-get install -q -y python3-pip
+      - run: pip3 install absl-py
+      - run:
+          name: install bazel
+          command: |
+            apt-get install -q -y bazel
+      - run: test/test_bazel.sh
+
+  test-bazel-mac:
+    macos:
+      xcode: "12.2.0"
+    environment:
+      EMSDK_NOTTY: "1"
+      HOMEBREW_NO_AUTO_UPDATE: "1"
+    steps:
+      - checkout
+      - run: brew install grep
+      - run:
+          name: install bazel
+          command: |
+            brew install bazel
+      - run: test/test_bazel_mac.sh
 
 workflows:
   flake8:
@@ -103,3 +214,18 @@ workflows:
   test-windows:
     jobs:
       - test-windows
+  build-docker-image:
+    jobs:
+      - build-docker-image
+      - publish-docker-image:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /.*/
+  test-bazel-linux:
+    jobs:
+      - test-bazel-linux
+  test-bazel-mac:
+    jobs:
+      - test-bazel-mac

.dockerignore

@@ -0,0 +1,21 @@
+# Ignore all subdirectories
+*/*
+
+# Allow to run the test script inside the Docker container
+!/docker/test_dockerimage.sh
+
+# Ignore unnecessary files inside top-level directory
+*.bat
+*.csh
+*.fish
+*.ps1
+*.pyc
+.emscripten
+.emscripten.old
+.emscripten_cache
+.emscripten_cache__last_clear
+.emscripten_sanity
+.emscripten_sanity_wasm
+.flake8
+emscripten-releases-tot.txt
+README.md

.flake8

@@ -6,6 +6,7 @@ ignore =
    E121, # Continuation line under-indented for hanging indent
    E722  # bare excepts
 exclude =
+  ./llvm
   ./gnu
   ./upstream
   ./fastcomp

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 365
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because there has been no
+  activity in the past year.  It will be closed automatically if no further
+  activity occurs in the next 30 days.  Feel free to re-open at any time if this
+  issue is still relevant.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -9,10 +9,6 @@ __pycache__
 /.emscripten_sanity
 /.emscripten_sanity_wasm
 
-# Auto-generated by `active`
-/emsdk_set_env.bat
-/emsdk_set_env.sh
-
 # Tags files that get generated at runtime
 /emscripten-releases-tot.txt
 

README.md

@@ -56,7 +56,8 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
 
 ### Mac OS X
 
-- `python`: Version 2.7.0 or above.
+- For Intel-based Macs, macOS 10.13 or newer. For ARM64 M1 based Macs, macOS
+  11.0 or newer.
 - `java`: For running closure compiler (optional).  After installing emscripten
   via emsdk, typing 'emcc --help' should pop up a OS X dialog "Java is not
   installed. To open java, you need a Java SE 6 runtime. Would you like to
@@ -117,8 +118,7 @@ SDK from the local hard drive completely.
 
 `emsdk update` will fetch package information for all the new tools and
 SDK versions. After that, run `emsdk install <tool/sdk name>` to install a new
-version. The command `emsdk update-tags` obtains a list of all new tagged
-releases from GitHub without updating Emscripten SDK itself.
+version.
 
 ### How do I install an old Emscripten compiler version?
 
@@ -139,8 +139,8 @@ categories.
 To obtain and build latest upstream wasm SDK from source, run
 
 ```
-emsdk install sdk-upstream-master-64bit
-emsdk activate sdk-upstream-master-64bit
+emsdk install sdk-upstream-main-64bit
+emsdk activate sdk-upstream-main-64bit
 ```
 
 You can use this target for example to bootstrap developing patches to LLVM,
@@ -156,8 +156,8 @@ https://emscripten.org/docs/contributing/developers_guide.html?highlight=develop
 ### When working on git branches compiled from source, how do I update to a newer compiler version?
 
 Unlike tags and precompiled versions, a few of the SDK packages are based on
-"moving" git branches and compiled from source (e.g. sdk-upstream-master,
-sdk-master, emscripten-master, binaryen-master). Because of that, the
+"moving" git branches and compiled from source (e.g. sdk-upstream-main,
+sdk-main, emscripten-main, binaryen-main). Because of that, the
 compiled versions will eventually go out of date as new commits are introduced
 to the development branches. To update an old compiled installation of one of
 this branches, simply reissue the "emsdk install" command on that tool/SDK. This
@@ -176,9 +176,8 @@ reissuing `emsdk install`.
 
 You can toggle between different tools and SDK versions by running `emsdk
 activate <tool/sdk name>`. Activating a tool will set up `~/.emscripten` to
-point to that particular tool. On Windows, you can pass the option `--global` to
-the `activate` command to register the environment permanently to the system
-registry for all users.
+point to that particular tool. On Windows, you can pass the option `--permanent` to
+the `activate` command to register the environment permanently for the current user. Use `--system` to do this for all users.
 
 ### How do I build multiple projects with different SDK versions in parallel?
 
@@ -199,11 +198,11 @@ where you directly interact with the github repositories. This allows you to
 obtain new features and latest fixes immediately as they are pushed to the
 github repository, without having to wait for release to be tagged. You do not
 need a github account or a fork of Emscripten to do this. To switch to using the
-latest upstream git development branch `master`, run the following:
+latest upstream git development branch `main`, run the following:
 
     emsdk install git-1.9.4 # Install git. Skip if the system already has it.
-    emsdk install sdk-upstream-master-64bit # Clone+pull the latest emscripten-core/emscripten/master.
-    emsdk activate sdk-upstream-master-64bit # Set the master SDK as the currently active one.
+    emsdk install sdk-upstream-main-64bit # Clone+pull the latest emscripten-core/emscripten/main.
+    emsdk activate sdk-upstream-main-64bit # Set the main SDK as the currently active one.
 
 ### How do I use my own Emscripten github fork with the SDK?
 
@@ -213,16 +212,16 @@ acquainted with working on multiple remotes in a git clone, these steps should
 be familiar to you. This is useful in the case when you want to make your own
 modifications to the Emscripten toolchain, but still keep using the SDK
 environment and tools. To set up your own fork as the currently active
-Emscripten toolchain, first install the `sdk-master` SDK like shown in the
+Emscripten toolchain, first install the `sdk-main` SDK like shown in the
 previous section, and then run the following commands in the emsdk directory:
 
-    cd emscripten/master
+    cd emscripten/main
     # Add a git remote link to your own repository.
     git remote add myremote https://github.com/mygituseraccount/emscripten.git
     # Obtain the changes in your link.
     git fetch myremote
-    # Switch the emscripten-master tool to use your fork.
-    git checkout -b mymaster --track myremote/master
+    # Switch the emscripten-main tool to use your fork.
+    git checkout -b mymain --track myremote/main
 
 In this way you can utilize the Emscripten SDK tools while using your own git
 fork. You can switch back and forth between remotes via the `git checkout`

bazel/BUILD

@@ -0,0 +1,44 @@
+package(default_visibility = ['//visibility:public'])
+
+config_setting(
+    name = "linux",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+config_setting(
+    name = "macos",
+    constraint_values = [
+        "@platforms//os:macos",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+config_setting(
+    name = "windows",
+    constraint_values = [
+        "@platforms//os:windows",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+alias(
+    name = "binaries",
+    actual = select({
+        ":linux": "@emscripten_bin_linux//:all",
+        ":macos": "@emscripten_bin_mac//:all",
+        ":windows": "@emscripten_bin_win//:all",
+    }),
+)
+
+alias(
+    name = "node_modules",
+    actual = select({
+        ":linux": "@emscripten_npm_linux//:node_modules",
+        ":macos": "@emscripten_npm_mac//:node_modules",
+        ":windows": "@emscripten_npm_win//:node_modules",
+    }),
+)
+