Use MozTools 4.0 and vendored autoconf (#392)

* MozTools 4.0

* fix paths for msys2

* use vendored autoconf

* better error

* moztools4.0 in ci

* fixup

* switch to servo-build-deps

Author: sagudev

.github/workflows/rust.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install deps
-        run: brew install python autoconf@2.13 llvm yasm
+        run: brew install python llvm yasm
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.3
         with:
@@ -53,7 +53,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Install deps
         run: |
-          sudo apt install autoconf2.13 llvm -y
+          sudo apt install llvm -y
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.3
         with:
@@ -74,7 +74,7 @@ jobs:
       LINKER: "lld-link.exe"
       CC: "clang-cl"
       CXX: "clang-cl"
-      MOZTOOLS_PATH: "${{ github.workspace }}\\target\\dependencies\\moztools-3.2"
+      MOZTOOLS_PATH: "${{ github.workspace }}\\target\\dependencies\\moztools-4.0"
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
@@ -86,7 +86,7 @@ jobs:
           components: rust-src
       - name: Install deps
         run: |
-          curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-3.2.zip" --create-dirs -o target/dependencies/moztools.zip
+          curl -SL "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip" --create-dirs -o target/dependencies/moztools.zip
           cd target/dependencies && unzip -qo moztools.zip -d .
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.3

README.md

@@ -13,11 +13,10 @@ are in the [rust-mozjs directory][r-m].
 
 ## Linux
 
-Install Clang (at least version 3.9) and autoconf v 2.13, for example on a
-Debian-based Linux:
+Install Clang and `build-essential`, for example on a Debian-based Linux:
 
 ```sh
-sudo apt-get install clang-6.0 autoconf2.13
+sudo apt-get install clang build-essential
 ```
 
 If you have more than one version of Clang installed, you can set the `LIBCLANG_PATH`
@@ -29,8 +28,8 @@ export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
 
 ## Windows
 
-1. Install [MozillaBuild 3.4](https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.4.exe)
-   or download and unzip [MozTools 3.2](https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-3.2.zip)
+1. Install [MozillaBuild 4.0](https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-4.0.2.exe)
+   or download and unzip [MozTools 4.0](https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-4.0.zip)
 
 2. Download and install Clang for Windows (64 bit) from <https://releases.llvm.org/download.html>.
 
@@ -58,7 +57,7 @@ export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
    or if you unzipped MozTools in 1.:
 
    ```shell
-    set MOZTOOLS_PATH=C:\path\to\moztools-3.2
+    set MOZTOOLS_PATH=C:\path\to\moztools-4.0
    ```
 
 ## Run Cargo

mozjs/build.rs

@@ -36,7 +36,7 @@ const EXTRA_FILES: &'static [&'static str] = &[
 ];
 
 /// Which version of moztools we expect
-const MOZTOOLS_VERSION: &str = "3.2";
+const MOZTOOLS_VERSION: &str = "4.0";
 
 fn main() {
     // https://github.com/servo/mozjs/issues/113
@@ -175,26 +175,15 @@ fn build_jsapi(build_dir: &Path) {
             );
         };
         let mut paths = Vec::new();
-        paths.push(moztools.join("msys").join("bin"));
+        paths.push(moztools.join("msys2").join("usr").join("bin"));
         paths.push(moztools.join("bin"));
         paths.extend(env::split_paths(&env::var_os("PATH").unwrap()));
         env::set_var("PATH", &env::join_paths(paths).unwrap());
 
-        if env::var_os("AUTOCONF").is_none() {
-            env::set_var(
-                "AUTOCONF",
-                moztools
-                    .join("msys")
-                    .join("local")
-                    .join("bin")
-                    .join("autoconf-2.13"),
-            );
-        }
-
         make = OsStr::new("mozmake").to_os_string();
     }
 
-    let mut cmd = Command::new(make);
+    let mut cmd = Command::new(make.clone());
 
     let encoding_c_mem_include_dir = env::var("DEP_ENCODING_C_MEM_INCLUDE_DIR").unwrap();
     let mut cppflags = OsString::from("-I");
@@ -222,7 +211,7 @@ fn build_jsapi(build_dir: &Path) {
         .env("SRC_DIR", &cargo_manifest_dir.join("mozjs"))
         .env("NO_RUST_PANIC_HOOK", "1")
         .status()
-        .expect("Failed to run `make`");
+        .expect(&format!("Failed to run `{:?}`", make));
     assert!(result.success());
 
     println!(