dotnet · lewing · Feb 16, 2022 · Jun 8, 2021 · Jun 8, 2021 · Jun 10, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,6 +28,11 @@ jobs:
     executor: bionic
     environment:
       EMSDK_NOTTY: "1"
+      # This is needed because the old gcc-7 that is installed on debian/bionic
+      # generates warnings about unused variables when doing C++17
+      # destructuring:
+      # https://github.com/WebAssembly/binaryen/issues/4353
+      CXXFLAGS: "-Wno-unused-variable"
       # I don't know why circleci VMs pretent to have 36 cores but its a lie.
       EMSDK_NUM_CORES: "4"
     steps:
@@ -201,6 +206,28 @@ jobs:
             brew install bazel
       - run: test/test_bazel_mac.sh
 
+  test-bazel-windows:
+    executor:
+      name: win/vs2019
+      shell: powershell.exe -ExecutionPolicy Bypass
+    environment:
+      PYTHONUNBUFFERED: "1"
+      EMSDK_NOTTY: "1"
+    steps:
+      - checkout
+      - run:
+          name: Download Bazelisk
+          shell: powershell.exe
+          command: |
+            $ProgressPreference = "SilentlyContinue"
+            Invoke-WebRequest -Uri https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-windows-amd64.exe -OutFile ( New-Item -Path "temp\bazel\bazel.exe" -Force )
+      - run:
+          name: Run Tests
+          shell: powershell.exe
+          command: |
+            $env:Path += ";C:\Python27amd64;$pwd\temp\bazel"
+            .\test\test_bazel.ps1
+
 workflows:
   flake8:
     jobs:
@@ -229,3 +256,6 @@ workflows:
   test-bazel-mac:
     jobs:
       - test-bazel-mac
+  test-bazel-windows:
+    jobs:
+      - test-bazel-windows
diff --git a/.dockerignore b/.dockerignore
@@ -1,21 +1,20 @@
-# Ignore all subdirectories
-*/*
+# Ignore everything
+*
 
 # 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
+# Allow license file
+!LICENSE
+
+# Allow necessary build files in top-level directory
+!emscripten-releases-tags.json
+!emsdk
+!emsdk.py
+!emsdk_env.sh
+!emsdk_manifest.json
+
+# Allow files required to install legacy versions
+!legacy-binaryen-tags.txt
+!legacy-emscripten-tags.txt
+!llvm-tags-64bit.txt
diff --git a/bazel/.gitignore b/bazel/.gitignore
@@ -0,0 +1 @@
+/bazel-*
diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl
@@ -19,7 +19,7 @@ def emscripten_deps(emscripten_version = "latest"):
 
     revision = EMSCRIPTEN_TAGS[version]
 
-    emscripten_url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/{}/{}/wasm-binaries.tbz2"
+    emscripten_url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/{}/{}/wasm-binaries.{}"
 
     # This could potentially backfire for projects with multiple emscripten
     # dependencies that use different emscripten versions
@@ -28,7 +28,7 @@ def emscripten_deps(emscripten_version = "latest"):
         http_archive(
             name = "emscripten_bin_linux",
             strip_prefix = "install",
-            url = emscripten_url.format("linux", revision.hash),
+            url = emscripten_url.format("linux", revision.hash, "tbz2"),
             sha256 = revision.sha_linux,
             build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
             type = "tar.bz2",
@@ -38,7 +38,7 @@ def emscripten_deps(emscripten_version = "latest"):
         http_archive(
             name = "emscripten_bin_mac",
             strip_prefix = "install",
-            url = emscripten_url.format("mac", revision.hash),
+            url = emscripten_url.format("mac", revision.hash, "tbz2"),
             sha256 = revision.sha_mac,
             build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
             type = "tar.bz2",
@@ -48,10 +48,10 @@ def emscripten_deps(emscripten_version = "latest"):
         http_archive(
             name = "emscripten_bin_win",
             strip_prefix = "install",
-            url = emscripten_url.format("win", revision.hash),
+            url = emscripten_url.format("win", revision.hash, "zip"),
             sha256 = revision.sha_win,
             build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
-            type = "tar.bz2",
+            type = "zip",
         )
 
     if "emscripten_npm_linux" not in excludes:

diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
@@ -6,9 +6,12 @@ filegroup(
     name = "common-script-includes",
     srcs = [
         "emar.sh",
+        "emar.bat",
         "emcc.sh",
+        "emcc.bat",
         "emscripten_config",
         "env.sh",
+        "env.bat",
         "@emsdk//:binaries",
         "@emsdk//:node_modules",
         "@nodejs//:node_files",
@@ -24,6 +27,7 @@ filegroup(
     name = "link-emscripten",
     srcs = [
         "emcc_link.sh",
+        "emcc_link.bat",
         "link_wrapper.py",
         ":common-script-includes",
         "@emsdk//:binaries",
@@ -51,6 +55,10 @@ emscripten_cc_toolchain_config_rule(
     cpu = "wasm",
     em_config = "emscripten_config",
     emscripten_binaries = "@emsdk//:binaries",
+    script_extension = select({
+        "@bazel_tools//src/conditions:host_windows": "bat",
+        "//conditions:default": "sh",
+    }),
 )
 
 cc_toolchain(

diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
@@ -74,23 +74,27 @@ def _impl(ctx):
 
     builtin_sysroot = emscripten_dir + "/emscripten/cache/sysroot"
 
+    emcc_script = "emcc.%s" % ctx.attr.script_extension
+    emcc_link_script = "emcc_link.%s" % ctx.attr.script_extension
+    emar_script = "emar.%s" % ctx.attr.script_extension
+
     ################################################################
     # Tools
     ################################################################
-    clang_tool = tool(path = "emcc.sh")
+    clang_tool = tool(path = emcc_script)
     clif_match_tool = tool(path = "dummy_clif_matcher")
-    link_tool = tool(path = "emcc_link.sh")
-    archive_tool = tool(path = "emar.sh")
+    link_tool = tool(path = emcc_link_script)
+    archive_tool = tool(path = emar_script)
     strip_tool = tool(path = "NOT_USED_STRIP_TOOL")
 
     #### Legacy tool paths (much of this is redundant with action_configs, but
     #### these are still used for some things)
     tool_paths = [
-        tool_path(name = "ar", path = "emar.sh"),
+        tool_path(name = "ar", path = emar_script),
         tool_path(name = "cpp", path = "/bin/false"),
-        tool_path(name = "gcc", path = "emcc.sh"),
+        tool_path(name = "gcc", path = emcc_script),
         tool_path(name = "gcov", path = "/bin/false"),
-        tool_path(name = "ld", path = "emcc_link.sh"),
+        tool_path(name = "ld", path = emcc_link_script),
         tool_path(name = "nm", path = "NOT_USED"),
         tool_path(name = "objdump", path = "/bin/false"),
         tool_path(name = "strip", path = "NOT_USED"),
@@ -572,9 +576,10 @@ def _impl(ctx):
         flag_set(
             actions = all_compile_actions +
                       all_link_actions,
-            flags = ["-O3"],
+            flags = ["-O2"],
             features = ["opt"],
         ),
+
         # Users can override opt-level with semantic names...
         flag_set(
             actions = all_compile_actions +
@@ -598,7 +603,7 @@ def _impl(ctx):
         flag_set(
             actions = all_compile_actions +
                       all_link_actions,
-            flags = ["-O2"],
+            flags = ["-O0"],
             features = ["fastbuild"],
         ),
 
@@ -1105,6 +1110,7 @@ emscripten_cc_toolchain_config_rule = rule(
         "cpu": attr.string(mandatory = True, values = ["asmjs", "wasm"]),
         "em_config": attr.label(mandatory = True, allow_single_file = True),
         "emscripten_binaries": attr.label(mandatory = True),
+        "script_extension": attr.string(mandatory = True, values = ["sh", "bat"]),
     },
     provides = [CcToolchainConfigInfo],
 )
diff --git a/bazel/emscripten_toolchain/emar.bat b/bazel/emscripten_toolchain/emar.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+
+call external\emsdk\emscripten_toolchain\env.bat
+
+py -3 %EMSCRIPTEN%\emar.py %*
diff --git a/bazel/emscripten_toolchain/emcc.bat b/bazel/emscripten_toolchain/emcc.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+
+call external\emsdk\emscripten_toolchain\env.bat
+
+py -3 %EMSCRIPTEN%\emcc.py %*
diff --git a/bazel/emscripten_toolchain/emcc_link.bat b/bazel/emscripten_toolchain/emcc_link.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+
+call external\emsdk\emscripten_toolchain\env.bat
+
+py -3 external\emsdk\emscripten_toolchain\link_wrapper.py %*
diff --git a/bazel/emscripten_toolchain/emscripten_config b/bazel/emscripten_toolchain/emscripten_config
@@ -8,5 +8,5 @@ LLVM_ROOT = BINARYEN_ROOT + "/bin"
 FROZEN_CACHE = True
 
 system = platform.system()
-nodejs_binary = "node.exe" if(system =="Windows") else "bin/node"
+nodejs_binary = "bin/nodejs/node.exe" if(system =="Windows") else "bin/node"
 NODE_JS = ROOT_DIR + "/external/nodejs_{}_amd64/{}".format(system.lower(), nodejs_binary)
diff --git a/bazel/emscripten_toolchain/env.bat b/bazel/emscripten_toolchain/env.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+
+set ROOT_DIR=%CD%
+set EMSCRIPTEN=%ROOT_DIR%\%EM_BIN_PATH%\emscripten
+set EM_CONFIG=%ROOT_DIR%\%EM_CONFIG_PATH%
diff --git a/bazel/emscripten_toolchain/link_wrapper.py b/bazel/emscripten_toolchain/link_wrapper.py
@@ -39,7 +39,7 @@
   sys.argv[1] = '@' + new_param_filename
 
 emcc_py = os.path.join(os.environ['EMSCRIPTEN'], 'emcc.py')
-rtn = subprocess.call(['python3', emcc_py] + sys.argv[1:])
+rtn = subprocess.call([sys.executable, emcc_py] + sys.argv[1:])
 if rtn != 0:
   sys.exit(1)
 
@@ -153,17 +153,14 @@
         wasm_base,
         '--add-section=external_debug_info=debugsection.tmp'])
 
-# If we have more than one output file then create tarball
-if len(files) > 1:
-  cmd = ['tar', 'cf', 'tmp.tar'] + files
-  subprocess.check_call(cmd, cwd=outdir)
-  os.rename(os.path.join(outdir, 'tmp.tar'), output_file)
-elif len(files) == 1:
-  # Otherwise, if only have a single output than move it to the expected name
-  if files[0] != os.path.basename(output_file):
-    os.rename(os.path.join(outdir, files[0]), output_file)
-else:
+# Make sure we have at least one output file.
+if not len(files):
   print('emcc.py did not appear to output any known files!')
   sys.exit(1)
 
+# cc_binary must output exactly one file; put all the output files in a tarball.
+cmd = ['tar', 'cf', 'tmp.tar'] + files
+subprocess.check_call(cmd, cwd=outdir)
+os.rename(os.path.join(outdir, 'tmp.tar'), output_file)
+
 sys.exit(0)
diff --git a/bazel/emscripten_toolchain/wasm_binary.py b/bazel/emscripten_toolchain/wasm_binary.py
@@ -20,8 +20,7 @@
 
 import argparse
 import os
-import subprocess
-import sys
+import tarfile
 
 
 def ensure(f):
@@ -41,29 +40,14 @@ def main():
   parser.add_argument('--output_path', help='The path to extract into.')
   args = parser.parse_args()
 
+  args.archive = os.path.normpath(args.archive)
+
   basename = os.path.basename(args.archive)
   stem = basename.split('.')[0]
 
-  # Check the type of the input file
-  mimetype_bytes = subprocess.check_output(['file', '-Lb', '--mime-type', '--mime-encoding', args.archive])
-  mimetype = mimetype_bytes.decode(sys.stdout.encoding)
-
-  # If we have a tar, extract all files. If we have just a single file, copy it.
-  if 'tar' in mimetype:
-    subprocess.check_call(
-        ['tar', 'xf', args.archive, '-C', args.output_path])
-  elif 'binary' in mimetype:
-    subprocess.check_call([
-        'cp',
-        args.archive,
-        os.path.join(args.output_path, stem + '.wasm')])
-  elif 'text' in mimetype:
-    subprocess.check_call([
-        'cp',
-        args.archive,
-        os.path.join(args.output_path, stem + '.js')])
-  else:
-    subprocess.check_call(['cp', args.archive, args.output_path])
+  # Extract all files from the tarball.
+  tar = tarfile.open(args.archive)
+  tar.extractall(args.output_path)
 
   # At least one of these two files should exist at this point.
   ensure(os.path.join(args.output_path, stem + '.js'))

diff --git a/bazel/emscripten_toolchain/wasm_cc_binary.bzl b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
@@ -55,15 +55,10 @@ _wasm_transition = transition(
 )
 
 def _wasm_binary_impl(ctx):
-    cc_target = ctx.attr.cc_target[0]
+    args = ctx.actions.args()
+    args.add("--output_path", ctx.outputs.loader.dirname)
+    args.add_all("--archive", ctx.files.cc_target)
 
-    args = [
-        "--output_path={}".format(ctx.outputs.loader.dirname),
-    ] + [
-        ctx.expand_location("--archive=$(location {})".format(
-            cc_target.label,
-        ), [cc_target]),
-    ]
     outputs = [
         ctx.outputs.loader,
         ctx.outputs.wasm,
@@ -80,7 +75,7 @@ def _wasm_binary_impl(ctx):
     ctx.actions.run(
         inputs = ctx.files.cc_target,
         outputs = outputs,
-        arguments = args,
+        arguments = [args],
         executable = ctx.executable._wasm_binary_extractor,
     )
 

diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
@@ -2,11 +2,35 @@
 # DO NOT MODIFY
 
 EMSCRIPTEN_TAGS = {
+    "3.1.1": struct(
+        hash = "5ee64de9809592480da01372880ea11debd6c740",
+        sha_linux = "ba94c5ecabacbedc89665a742c37c4c132c739aea46aa66fd744cb72b260c870",
+        sha_mac = "8b5f8cec55af0e6816a08d8d1e8b873f96d0e0504fdd6e8deb2fc024957d1aa7",
+        sha_win = "6cbe976aff6155cf1c48707f0520b5aa6a7770860e9b1964bfca3e5923ce7225",
+    ),
+    "3.1.0": struct(
+        hash = "562e3a0af169e6dea5e6dbecac2255d67c2c8b94",
+        sha_linux = "0714344e32e244e6d44d9ea75937633ab1338e417a232fb66d6dcd7d4b704e8c",
+        sha_mac = "f6c1cad729ed799e1df09eacf5aa80cce9861d69ec6d9581c17e4ba8d9b064ce",
+        sha_win = "756c41cbcab4ae6077cca30834d16151392b8c19ab186c13d42d7d05d6d727cc",
+    ),
+    "3.0.1": struct(
+        hash = "91b7a67a486d2430e73423a38d950d8a550826ed",
+        sha_linux = "25fd430268596229c4ac38e188d7c2b31f75c2ec8172b1351d763e37c830c6af",
+        sha_mac = "52ec2204115b727cc4de38b5eeae147eead12b299b98e5a88653d12958cae4d4",
+        sha_win = "0e072736b471c9a07cdf534ba4da46b3b6545b63c8a6cbb0ef7d544251e15092",
+    ),
+    "3.0.0": struct(
+        hash = "7fbe748230f2ce99abbf975d9ad997699efb3153",
+        sha_linux = "10646b64daea15354f14f89f7e79937f420b77f31bda7c4b174de2474835950f",
+        sha_mac = "ebb17bc91c6a72ca06d17337d27aa1a2be4c9af4c68644c221712123f663b8ab",
+        sha_win = "0d4f2ff5d88a8eef5ed769ee4ffc5d5574143911d2e0079325cdc5206c9e9bb1",
+    ),
     "2.0.34": struct(
         hash = "d8fc1b92dbc0ce8d740a7adb937c5137ba4755e0",
         sha_linux = "a6304e3a52c172eb178c6f9817d74aa3ee411e97ef00bcae0884377799c49954",
         sha_mac = "975ae11000100362baf19d161fec04d82e1f7c9fb7d43c43864ddd65a47f1780",
-        sha_win = "30f64dbc6425490157360439d40141feae359dbf586f59fa23185d7e009f3209",
+        sha_win = "8167a44bb895a0fdc153836bed91bf387be57f2dc1b8f103bf70e68923b61d39",
     ),
     "2.0.33": struct(
         hash = "cef8850d57278271766fb2163eebcb07354018e7",