Use crunch64-cli crate

pmret · Jun 2, 2024 · 35ca209 · 35ca209
1 parent 1f9a08b
commit 35ca209
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,7 +19,7 @@ pipeline {
                 sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
                 sh 'pip install -U -r requirements.txt'
                 sh 'cargo install pigment64'
-                sh 'cargo install crunch64'
+                sh 'cargo install crunch64-cli'
                 sh './configure'
             }
         }

diff --git a/tools/build/configure.py b/tools/build/configure.py
@@ -26,8 +26,8 @@
 CRUNCH64 = "crunch64"
 
 RUST_TOOLS = [
-    (PIGMENT64, "0.4.2"),
-    (CRUNCH64, "0.3.1"),
+    (PIGMENT64, "pigment64", "0.4.2"),
+    (CRUNCH64, "crunch64-cli", "0.3.1"),
 ]
 
 
@@ -1338,17 +1338,17 @@ def make_current(self, ninja: ninja_syntax.Writer):
     version_err_msg = ""
     missing_tools = []
     version_old_tools = []
-    for tool, req_version in RUST_TOOLS:
+    for tool, crate_name, req_version in RUST_TOOLS:
         try:
             version = exec_shell([tool, "--version"]).split(" ")[1].strip()
 
             if version < req_version:
                 version_err_msg += (
                     f"error: {tool} version {req_version} or newer is required, system version is {version}"
                 )
-                version_old_tools.append(tool)
+                version_old_tools.append(crate_name)
         except (FileNotFoundError, PermissionError):
-            missing_tools.append(tool)
+            missing_tools.append(crate_name)
 
     if version_old_tools or missing_tools:
         if version_err_msg: