Bump spidermonkey (#6)

* Bump spidermonkey to the version included with firefox 107
* Update the build script to use mach for everything, instead of autospider.py
* Remove the call to apt-get update from the build-engine.sh script

Author: elliottt

.github/workflows/main.yml

@@ -30,6 +30,7 @@ jobs:
       if: steps.sm-cache.outputs.cache-hit != 'true'
       run: |
         mkdir dist
+        sudo apt-get update -y
         bash ./build-engine.sh release
         tar -a -cf dist/spidermonkey-wasm-static-lib_release.tar.gz release
         rm -rf release obj-release

.gitignore

@@ -4,5 +4,6 @@
 /release
 /debug
 /dist
+/mozconfig-*
 .DS_Store
 .vscode

build-engine.sh

@@ -1,69 +1,110 @@
 #!/usr/bin/env bash
-set -ex
+
+set -euo pipefail
+set -x
 
 working_dir="$(pwd)"
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-# Ensure apt-get is current, because otherwise bootstrapping might fail
-sudo apt-get update -y
+mode="${1:-release}"
+mozconfig="${working_dir}/mozconfig-${mode}"
+objdir="obj-$mode"
+outdir="$mode"
+
+cat << EOF > "$mozconfig"
+ac_add_options --enable-project=js
+ac_add_options --enable-application=js
+ac_add_options --target=wasm32-unknown-wasi
+ac_add_options --disable-stdcxx-compat
+ac_add_options --without-system-zlib
+ac_add_options --without-intl-api
+ac_add_options --disable-jit
+ac_add_options --disable-shared-js
+ac_add_options --disable-shared-memory
+ac_add_options --disable-tests
+ac_add_options --disable-clang-plugin
+ac_add_options --enable-jitspew
+ac_add_options --enable-optimize
+ac_add_options --enable-js-streams
+ac_add_options --prefix=${working_dir}/${objdir}/dist
+mk_add_options MOZ_OBJDIR=${working_dir}/${objdir}
+EOF
+
+case "$mode" in
+  release)
+    echo "ac_add_options --disable-debug" >> "$mozconfig"
+    ;;
+
+  debug)
+    echo "ac_add_options --enable-debug" >> "$mozconfig"
+    ;;
+
+  *)
+    echo "Unknown build type: $mode"
+    exit 1
+    ;;
+esac
+
 
 # Ensure the Rust version matches that used by Gecko, and can compile to WASI
-rustup update 1.57.0
-rustup default 1.57.0
 rustup target add wasm32-wasi
 
-if [[ ! -a gecko-dev ]]
-then
+fetch_commits=
+if [[ ! -a gecko-dev ]]; then
 
   # Clone Gecko repository at the required revision
   mkdir gecko-dev
-  cd gecko-dev
 
-  git init
-  git remote add --no-tags -t wasi-embedding origin $(cat $script_dir/gecko-repository)
-  cd ..
+  git -C gecko-dev init
+  git -C gecko-dev remote add --no-tags -t wasi-embedding \
+    origin "$(cat "$script_dir/gecko-repository")"
+
+  fetch_commits=1
 fi
 
-cd gecko-dev
-git fetch --depth 1 origin $(cat $script_dir/gecko-revision)
-git checkout FETCH_HEAD
+target_rev="$(cat "$script_dir/gecko-revision")"
+if [[ -n "$fetch_commits" ]] || \
+  [[ "$(git -C gecko-dev rev-parse HEAD)" != "$target_rev" ]]; then
+  git -C gecko-dev fetch --depth 1 origin "$target_rev"
+  git -C gecko-dev checkout FETCH_HEAD
+fi
 
-# Use Gecko's build system bootstrapping to ensure all dependencies are installed
-./mach bootstrap --application-choice=js
+# Use Gecko's build system bootstrapping to ensure all dependencies are
+# installed
+cd gecko-dev
+./mach --no-interactive bootstrap --application-choice=js --no-system-changes
 
-# ... except, that doesn't install the wasi-sysroot, which we need, so we do that manually.
+# ... except, that doesn't install the wasi-sysroot, which we need, so we do
+# that manually.
 cd ~/.mozbuild
 python3 \
-  ${working_dir}/gecko-dev/mach \
+  "${working_dir}/gecko-dev/mach" \
+  --no-interactive \
   artifact \
   toolchain \
   --bootstrap \
   --from-build \
   sysroot-wasm32-wasi
 
-cd ${working_dir}
-
-mode="release"
-flags="--optimize --no-debug --build-only"
-if [[ $1 == 'debug' ]]
-then
-  mode="debug"
-  flags="--optimize --debug"
-fi
-rust_lib_dir=$mode
-objdir=obj-$mode
-outdir=$mode
-
-echo $flags $rust_lib_dir
+cd "$working_dir"
 
 # Build SpiderMonkey for WASI
-MOZ_FETCHES_DIR=~/.mozbuild CC=~/.mozbuild/clang/bin/clang gecko-dev/js/src/devtools/automation/autospider.py --objdir=$objdir $flags wasi
+MOZCONFIG="${mozconfig}" \
+MOZ_FETCHES_DIR=~/.mozbuild \
+CC=~/.mozbuild/clang/bin/clang \
+  python3 "${working_dir}/gecko-dev/mach" \
+  --no-interactive \
+    build
 
 # Copy header, object, and static lib files
-rm -rf $outdir
-mkdir -p $outdir/lib
+rm -rf "$outdir"
+mkdir -p "$outdir/lib"
+
+cd "$objdir"
+cp -Lr dist/include "../$outdir"
+
+while read -r file; do
+  cp "$file" "../$outdir/lib"
+done < "$script_dir/object-files.list"
 
-cd $objdir
-cp -Lr dist/include ../$outdir
-cp $(cat $script_dir/object-files.list) ../$outdir/lib
-cp js/src/build/libjs_static.a wasm32-wasi/${rust_lib_dir}/libjsrust.a ../$outdir/lib
+cp js/src/build/libjs_static.a "wasm32-wasi/${mode}/libjsrust.a" "../$outdir/lib"

download-engine.sh

@@ -1,21 +1,22 @@
 #!/usr/bin/env bash
-set -e
+
+set -euo pipefail
 
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 # # Get github repository url
-gh_url='https://github.'$(cd $script_dir && git remote get-url origin | cut -f2 -d. | tr ':' /)
+gh_url='https://github.'$(cd "$script_dir" && git remote get-url origin | cut -f2 -d. | tr ':' /)
 
 mode="release"
 if [[ $1 == "debug" ]]
 then
   mode="debug"
 fi
 
-git_rev=`cd $script_dir && git rev-parse HEAD`
-file=spidermonkey-wasm-static-lib_${mode}.tar.gz
-bundle_url=${gh_url}/releases/download/rev_${git_rev}/${file}
+git_rev="$(git -C "$script_dir" rev-parse HEAD)"
+file="spidermonkey-wasm-static-lib_${mode}.tar.gz"
+bundle_url="${gh_url}/releases/download/rev_${git_rev}/${file}"
 
-curl --fail -L -O $bundle_url
-tar xf $file
-rm $file
+curl --fail -L -O "$bundle_url"
+tar xf "$file"
+rm "$file"

gecko-revision

@@ -1 +1 @@
-885df10c4eea15d6fed25d476c895ad3aafc248f
+a0083bb748d3d416d9085e144d2359519e96e2d9