Remove Ninja requirement on aarch64

Ninja versions since 1.12.0 come with aarch64 binaries Signed-off-by: William Vinnicombe <[email protected]>
raspberrypi · May 29, 2024 · 6ff006e · 6ff006e
1 parent 2fabaa3
commit 6ff006e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ On older images the requirements can be installed by running `sudo apt install o
 - Git (in PATH)
 - Tar (in PATH)
 - Native C/C++ compiler (in PATH), supported compilers are: `gcc` and `clang`
-- Ninja in PATH (arm64 only)
 - \[Optional\] OpenOCD for debugging (Raspberry Pi OS only)
 - \[Optional\] gdb-multiarch for debugging (x86_64 only)
 

diff --git a/data/0.10.0/versionBundles.json b/data/0.10.0/versionBundles.json
@@ -5,7 +5,7 @@
       "macos": "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg",
       "windowsAmd64": "https://www.python.org/ftp/python/3.9.13/python-3.9.13-embed-amd64.zip"
     },
-    "ninja": "v1.11.1",
+    "ninja": "v1.12.1",
     "cmake": "v3.28.0-rc6",
     "toolchain": "12_3_Rel1"
   },
@@ -15,7 +15,7 @@
       "macos": "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg",
       "windowsAmd64": "https://www.python.org/ftp/python/3.12.1/python-3.12.1-embed-amd64.zip"
     },
-    "ninja": "v1.11.1",
+    "ninja": "v1.12.1",
     "cmake": "v3.28.0-rc6",
     "toolchain": "13_2_Rel1"
   }

diff --git a/src/utils/download.mts b/src/utils/download.mts
@@ -477,7 +477,13 @@ export async function downloadAndInstallNinja(
         return false;
       }
 
-      const assetName = `ninja-${NINJA_PLATFORMS[process.platform]}.zip`;
+      const assetName = `ninja-${NINJA_PLATFORMS[process.platform]}-${
+        process.platform === "linux"
+          ? process.arch === "arm64"
+            ? "aarch64"
+            : ""
+          : ""
+      }.zip`;
       // Find the asset with the name 'ninja-win.zip'
       ninjaAsset = release.assets.find(asset => asset.name === assetName);
     } else {

diff --git a/src/webview/newProjectPanel.mts b/src/webview/newProjectPanel.mts
@@ -59,8 +59,8 @@ import {
   setupExample,
 } from "../utils/examplesUtil.mjs";
 
-export const NINJA_AUTO_INSTALL_DISABLED =
-  process.platform === "linux" && process.arch === "arm64";
+export const NINJA_AUTO_INSTALL_DISABLED = false;
+  // process.platform === "linux" && process.arch === "arm64";
 
 interface ImportProjectMessageValue {
   selectedSDK: string;