Merge pull request #48 from mozilla-spidermonkey/next-beta

Switch back to building mozilla-beta in 'next' branch

Author: ptomato

.github/workflows/build.yml

@@ -28,15 +28,15 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install deps
       run: |
-        sudo apt install autoconf2.13 ccache llvm clang lld meson ninja-build -y
+        sudo apt install ccache llvm clang lld meson ninja-build -y
     - uses: actions-rs/toolchain@v1
       with:
           profile: minimal
           toolchain: stable
           override: true
           default: true
     - name: Get SM pkg
-      run: ./tools/get_sm_102.sh
+      run: ./tools/get_sm.sh
     - name: ccache cache files
       uses: actions/cache@v1.1.0
       with:
@@ -49,7 +49,6 @@ jobs:
         cd /tmp/mozjs
         cd $(ls -d */|head -n 1)
         cd js/src
-        autoconf2.13
         bash $GITHUB_WORKSPACE/tools/generic_lib.sh $GITHUB_WORKSPACE/meson.build
         mkdir _build
         cd _build

docs/Migration Guide.md

@@ -3,6 +3,14 @@
 This document describes how to port your code from using one ESR version
 of SpiderMonkey to the next ESR version.
 
+## ESR 102 to ESR 115 ##
+
+### Various API changes ###
+
+This is a non-exhaustive list of minor API changes and renames.
+
+- `JS::ModuleInstantiate` → `JS::ModuleLink`
+
 ## ESR 91 to ESR 102 ##
 
 ### Object private pointers ###

examples/modules.cpp

@@ -106,7 +106,7 @@ static bool ModuleExample(JSContext* cx) {
   }
 
   // Resolve imports by loading and compiling additional scripts.
-  if (!JS::ModuleInstantiate(cx, mod)) {
+  if (!JS::ModuleLink(cx, mod)) {
     boilerplate::ReportAndClearException(cx);
     return false;
   }

tools/generic_lib.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # Make SpiderMonkey and this repo generic instead of version specific.
-# script shoud be run in mozjs dit with $1 for mason.build location
+# script shoud be run in mozjs dir with $1 for meson.build location
 sed -i 's/mozjs-$MOZILLA_SYMBOLVERSION/mozjs/g' old-configure.in
-sed -i --regexp-extended "s/dependency\(.mozjs.*$/dependency('mozjs')/gm" "$1"
+sed -i --regexp-extended "s/dependency\(.mozjs.*$/dependency('mozjs')/gm" "$1"