dl moztool if not found

.github/workflows/rust.yml

@@ -73,11 +73,10 @@ jobs:
         #target: [""]
         target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
     env:
-        MOZILLA_BUILD: 'C:\mozilla-build'
         LINKER: "lld-link.exe"
         CC: "clang-cl"
         CXX: "clang-cl"
-        PYTHON3: "C:\\mozilla-build\\python3\\python3.exe"
+        PYTHON3: "python3"
     steps:
     - uses: actions/checkout@v3
     - uses: dtolnay/rust-toolchain@stable
@@ -87,10 +86,8 @@ jobs:
       with:
         toolchain: "nightly-2023-02-02"
         components: rust-src
-    - name: Install deps
+    - name: Add LLVM to PATH
       run: |
-        Start-BitsTransfer -Source https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.4.exe -Destination ./MozillaBuildSetup.exe
-        .\MozillaBuildSetup.exe /S | Out-Null
         echo 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Tools\LLVM\bin' | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Run sccache-cache
       uses: mozilla-actions/[email protected]

README.md

@@ -29,8 +29,7 @@ export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
 
 ## Windows
 
-1. Install [MozillaBuild 3.4][mozbuild].
-   [mozbuild]: https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.4.exe
+1. Install Python 3
 
 2. Download and install Clang for Windows (64 bit) from <https://releases.llvm.org/download.html>.
 
@@ -46,7 +45,6 @@ export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
    the dependencies above:
 
    ```shell
-    set MOZILLA_BUILD=C:\mozilla-build
     set LIBCLANG_PATH=C:\Program Files\LLVM\lib
    ```
 
@@ -76,7 +74,7 @@ mozjs_sys = { path = "../mozjs/mozjs" }
 In order to upgrade to a new version of SpiderMonkey:
 
 1. Find the mozilla-release commit for the desired version of SpiderMonkey, at
-   https://treeherder.mozilla.org/#/jobs?repo=mozilla-release&filter-searchStr=spidermonkey%20pkg.
+   <https://treeherder.mozilla.org/#/jobs?repo=mozilla-release&filter-searchStr=spidermonkey%20pkg>.
    You are looking for an SM(pkg) tagged with FIREFOX_RELEASE.
    Take a note of the commit number to the left (a hex number such as ac4fbb7aaca0).
 
@@ -98,7 +96,7 @@ In order to upgrade to a new version of SpiderMonkey:
 To get a dev environment with shell.nix:
 
 ```sh
-$ nix-shell
+nix-shell
 ```
 
 To configure rust-analyzer in Visual Studio Code:

mozjs/Cargo.toml

@@ -34,6 +34,12 @@ libc = "0.2"
 libz-sys = "1.0"
 
 [build-dependencies]
-bindgen = { version = "0.62", default-features = false, features = ["runtime", "which-rustfmt"] }
+bindgen = { version = "0.62", default-features = false, features = [
+  "runtime",
+  "which-rustfmt",
+] }
 cc = "1.0"
 walkdir = "2"
+
+[target.'cfg(windows)'.build-dependencies]
+zip = { version = "0.6", default-features = false, features = ["deflate"] }

mozjs/build.rs

@@ -5,6 +5,8 @@
 extern crate bindgen;
 extern crate cc;
 extern crate walkdir;
+#[cfg(windows)]
+extern crate zip;
 
 use std::env;
 use std::ffi::{OsStr, OsString};
@@ -38,6 +40,9 @@ const EXTRA_FILES: &'static [&'static str] = &[
     "src/jsglue.cpp",
 ];
 
+const MOZ_TOOLS_DL: &str =
+    "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/moztools-3.2.zip";
+
 /// Which version of moztools we expect
 const MOZ_TOOLS: &str = "moztools-3.2";
 
@@ -191,6 +196,33 @@ fn build_jsapi(build_dir: &Path) {
             // moztools already in targed/dependencies/moztools-*
             moztools
         } else {
+            // download moztools
+            let cargo_target_dir = cargo_target_dir();
+            let deps_dir = cargo_target_dir.join("dependencies");
+
+            // curl is on Win10+
+            let mut curl = Command::new("curl");
+
+            let moztools_zip = &deps_dir.join("moztools.zip");
+            let result = curl
+                .arg("-SL")
+                .arg(MOZ_TOOLS_DL)
+                .arg("--create-dirs")
+                .arg("-o")
+                .arg(moztools_zip.as_os_str())
+                .status()
+                .expect("Failed to download moztools.");
+            assert!(result.success());
+
+            // extract
+            let file = fs::File::open(moztools_zip).expect("Failed to read moztools.zip");
+            let mut archive = zip::ZipArchive::new(file).expect("Failed to read moztools archive");
+            archive
+                .extract(deps_dir)
+                .expect("Failed to unpack moztools");
+
+            fs::remove_file(&moztools_zip).expect("Failed to remove moztools.zip");
+
             find_moztools().unwrap()
         };
         let mut paths = Vec::new();