Skip to content

Commit 6ff006e

Browse files
committed
Remove Ninja requirement on aarch64
Ninja versions since 1.12.0 come with aarch64 binaries Signed-off-by: William Vinnicombe <[email protected]>
1 parent 2fabaa3 commit 6ff006e

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ On older images the requirements can be installed by running `sudo apt install o
3939
- Git (in PATH)
4040
- Tar (in PATH)
4141
- Native C/C++ compiler (in PATH), supported compilers are: `gcc` and `clang`
42-
- Ninja in PATH (arm64 only)
4342
- \[Optional\] OpenOCD for debugging (Raspberry Pi OS only)
4443
- \[Optional\] gdb-multiarch for debugging (x86_64 only)
4544

data/0.10.0/versionBundles.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"macos": "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg",
66
"windowsAmd64": "https://www.python.org/ftp/python/3.9.13/python-3.9.13-embed-amd64.zip"
77
},
8-
"ninja": "v1.11.1",
8+
"ninja": "v1.12.1",
99
"cmake": "v3.28.0-rc6",
1010
"toolchain": "12_3_Rel1"
1111
},
@@ -15,7 +15,7 @@
1515
"macos": "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg",
1616
"windowsAmd64": "https://www.python.org/ftp/python/3.12.1/python-3.12.1-embed-amd64.zip"
1717
},
18-
"ninja": "v1.11.1",
18+
"ninja": "v1.12.1",
1919
"cmake": "v3.28.0-rc6",
2020
"toolchain": "13_2_Rel1"
2121
}

src/utils/download.mts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,13 @@ export async function downloadAndInstallNinja(
477477
return false;
478478
}
479479

480-
const assetName = `ninja-${NINJA_PLATFORMS[process.platform]}.zip`;
480+
const assetName = `ninja-${NINJA_PLATFORMS[process.platform]}-${
481+
process.platform === "linux"
482+
? process.arch === "arm64"
483+
? "aarch64"
484+
: ""
485+
: ""
486+
}.zip`;
481487
// Find the asset with the name 'ninja-win.zip'
482488
ninjaAsset = release.assets.find(asset => asset.name === assetName);
483489
} else {

src/webview/newProjectPanel.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ import {
5959
setupExample,
6060
} from "../utils/examplesUtil.mjs";
6161

62-
export const NINJA_AUTO_INSTALL_DISABLED =
63-
process.platform === "linux" && process.arch === "arm64";
62+
export const NINJA_AUTO_INSTALL_DISABLED = false;
63+
// process.platform === "linux" && process.arch === "arm64";
6464

6565
interface ImportProjectMessageValue {
6666
selectedSDK: string;

0 commit comments

Comments
 (0)