Skip to content

Commit 8531025

Browse files
will-v-piwill-v-pi
committed
Add support for picotool 2.2.0-a4
Requires more thorough passing of picotool version Bump data version to 0.18.0 to prevent breakages
1 parent ce6f8d1 commit 8531025

File tree

11 files changed

+3332
-10
lines changed

11 files changed

+3332
-10
lines changed

‎data/0.18.1/examples.json‎

Lines changed: 1725 additions & 0 deletions
Large diffs are not rendered by default.

‎data/0.18.1/github-cache.json‎

Lines changed: 1469 additions & 0 deletions
Large diffs are not rendered by default.

‎data/0.18.1/supportedToolchains.ini‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
[14_2_Rel1]
2+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
3+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-darwin-arm64-arm-none-eabi.tar.xz
4+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
5+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
6+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-aarch64-arm-none-eabi.tar.xz
7+
[RISCV_ZCB_RPI_2_1_1_3]
8+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x64-win.zip
9+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-arm64-mac.zip
10+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-mac.zip
11+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x86_64-lin.tar.gz
12+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-aarch64-lin.tar.gz
13+
[13_3_Rel1]
14+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-mingw-w64-i686-arm-none-eabi.zip
15+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz
16+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-x86_64-arm-none-eabi.tar.xz
17+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
18+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz
19+
[13_2_Rel1]
20+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
21+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-darwin-arm64-arm-none-eabi.tar.xz
22+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
23+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
24+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz
25+
[RISCV_RPI_2_0_0_5]
26+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-win.zip
27+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-arm64-mac.zip
28+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-mac.zip
29+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x86_64-lin.tar.gz
30+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-aarch64-lin.tar.gz
31+
[RISCV_RPI_2_0_0_2]
32+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-x64-win.zip
33+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-arm64-mac.zip
34+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-x64-mac.zip
35+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-x86_64-lin.tar.gz
36+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-aarch64-lin.tar.gz
37+
[RISCV_RPI_2_0_0_1]
38+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-1/riscv-toolchain-14-x64-win.zip
39+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-1/riscv-toolchain-14-arm64-mac.zip
40+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-1/riscv-toolchain-14-x64-mac.zip
41+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-1/riscv-toolchain-14-x86_64-lin.tar.gz
42+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-1/riscv-toolchain-14-aarch64-lin.tar.gz
43+
[RISCV_13_3]
44+
win32_x64 = https://buildbot.embecosm.com/job/riscv32-gcc-win64-release/24/artifact/riscv32-embecosm-win64-gcc13.2.0.zip
45+
darwin_arm64 = https://buildbot.embecosm.com/job/riscv32-gcc-macos-arm64-release/10/artifact/riscv32-embecosm-macos-gcc13.3.0.zip
46+
darwin_x64 = https://buildbot.embecosm.com/job/riscv32-gcc-macos-release/21/artifact/riscv32-embecosm-macos-gcc13.3.0.zip
47+
linux_x64 = https://buildbot.embecosm.com/job/riscv32-gcc-ubuntu2204-release/12/artifact/riscv32-embecosm-ubuntu2204-gcc13.3.0.tar.gz
48+
[RISCV_COREV_MAY_24]
49+
win32_x64 = https://buildbot.embecosm.com/job/corev-gcc-win64/50/artifact/corev-openhw-gcc-win64-20240602.zip
50+
darwin_arm64 = https://buildbot.embecosm.com/job/corev-gcc-macos-arm64/8/artifact/corev-openhw-gcc-macos-20240530.zip
51+
darwin_x64 = https://buildbot.embecosm.com/job/corev-gcc-macos/48/artifact/corev-openhw-gcc-macos-20240530.zip
52+
linux_x64 = https://buildbot.embecosm.com/job/corev-gcc-ubuntu2204/47/artifact/corev-openhw-gcc-ubuntu2204-20240530.tar.gz
53+
[RISCV_RPI]
54+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-0/riscv-toolchain-14-aarch64-lin.tar.gz
55+
[12_3_Rel1]
56+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-mingw-w64-i686-arm-none-eabi.zip
57+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-darwin-arm64-arm-none-eabi.tar.xz
58+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-darwin-x86_64-arm-none-eabi.tar.xz
59+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz
60+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-aarch64-arm-none-eabi.tar.xz
61+
[12_2_Rel1]
62+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-mingw-w64-i686-arm-none-eabi.zip
63+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-darwin-arm64-arm-none-eabi.tar.xz
64+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
65+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz
66+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-aarch64-arm-none-eabi.tar.xz
67+
[11_3_Rel1]
68+
win32_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-mingw-w64-i686-arm-none-eabi.zip
69+
darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-darwin-arm64-arm-none-eabi.tar.xz
70+
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-darwin-x86_64-arm-none-eabi.tar.xz
71+
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
72+
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-aarch64-arm-none-eabi.tar.xz

‎data/0.18.1/versionBundles.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"1.5.0": {
3+
"ninja": "v1.12.1",
4+
"cmake": "v3.28.6",
5+
"picotool": "2.0.0",
6+
"toolchain": "12_3_Rel1",
7+
"riscvToolchain": "NONE"
8+
},
9+
"1.5.1": {
10+
"ninja": "v1.12.1",
11+
"cmake": "v3.28.6",
12+
"picotool": "2.0.0",
13+
"toolchain": "13_2_Rel1",
14+
"riscvToolchain": "NONE"
15+
},
16+
"2.0.0": {
17+
"ninja": "v1.12.1",
18+
"cmake": "v3.28.6",
19+
"picotool": "2.0.0",
20+
"toolchain": "13_2_Rel1",
21+
"riscvToolchain": "RISCV_RPI_2_0_0_5"
22+
},
23+
"2.1.0": {
24+
"ninja": "v1.12.1",
25+
"cmake": "v3.29.9",
26+
"picotool": "2.1.0",
27+
"toolchain": "13_3_Rel1",
28+
"riscvToolchain": "RISCV_RPI_2_0_0_5"
29+
},
30+
"2.1.1": {
31+
"ninja": "v1.12.1",
32+
"cmake": "v3.31.5",
33+
"picotool": "2.1.1",
34+
"toolchain": "14_2_Rel1",
35+
"riscvToolchain": "RISCV_RPI_2_0_0_5"
36+
},
37+
"2.2.0": {
38+
"ninja": "v1.12.1",
39+
"cmake": "v3.31.5",
40+
"picotool": "2.2.0-a4",
41+
"toolchain": "14_2_Rel1",
42+
"riscvToolchain": "RISCV_ZCB_RPI_2_1_1_3"
43+
}
44+
}

‎scripts/genCache.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@
6262
"v2.1.1-1",
6363
"v2.1.1-3",
6464
"v2.2.0-0",
65+
"v2.2.0-1",
6566
], # pico-sdk-tools
66-
["2.0.0", "2.1.0", "2.1.1", "2.2.0"], # picotool
67+
["2.0.0", "2.1.0", "2.1.1", "2.2.0", "2.2.0-a4"], # picotool
6768
]
6869

6970
headers = {
@@ -74,7 +75,8 @@
7475

7576
ret = {}
7677
for repo in range(num_repos):
77-
ret[f"githubApiCache-{repo}-0"] = versions[repo]
78+
ret[f"githubApiCache-{repo}-0"] = versions[repo].copy()
79+
ret[f"githubApiCache-{repo}-0"].reverse()
7880

7981
for version in versions[repo]:
8082
owner = stuff.ownerOfRepository(repo)

‎scripts/genExamples.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
examples.clear()
3737

38-
CURRENT_DATA_VERSION = "0.17.0"
38+
CURRENT_DATA_VERSION = "0.18.0"
3939

4040
SDK_VERSION_DEFAULT = "2.2.0"
4141
ARM_TOOLCHAIN_VERSION_DEFAULT = "14_2_Rel1"

‎src/commands/switchBoard.mts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ export default class SwitchBoardCommand extends Command {
229229
await updateVSCodeStaticConfigs(
230230
workspaceFolder.uri.fsPath,
231231
versions[0],
232-
selectedToolchain.version
232+
selectedToolchain.version,
233+
versions[2]
233234
);
234235
progress.report({
235236
increment: 20,

‎src/commands/switchSDK.mts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import { NINJA_AUTO_INSTALL_DISABLED } from "../webview/newProjectPanel.mjs";
3939
import Logger from "../logger.mjs";
4040
import type { Progress as GotProgress } from "got";
4141

42+
const DEFAULT_PICOTOOL_VERSION = "2.2.0-a4";
43+
4244
export interface AdvancedSwitchSDKOptions {
4345
toolchainVersion: { label: string; toolchain: SupportedToolchainVersion };
4446
cmakeVersion: string;
@@ -411,7 +413,8 @@ export default class SwitchSDKCommand extends Command {
411413
selectedSDK.label.replace("v", "")
412414
);
413415

414-
const selectedPicotool = versionBundle?.picotool;
416+
const selectedPicotool =
417+
versionBundle?.picotool ?? DEFAULT_PICOTOOL_VERSION;
415418

416419
const configureAdvancedOptions = await window.showQuickPick(["No", "Yes"], {
417420
title: "Switch Tools",
@@ -731,6 +734,7 @@ export default class SwitchSDKCommand extends Command {
731734
workspaceFolder.uri.fsPath,
732735
selectedSDK.sdk,
733736
selectedToolchain.toolchain.version,
737+
selectedPicotool,
734738
options.advancedOptions?.ninjaVersion,
735739
options.advancedOptions?.cmakeVersion
736740
);
@@ -744,7 +748,7 @@ export default class SwitchSDKCommand extends Command {
744748
workspaceFolder.uri,
745749
selectedSDK.sdk,
746750
selectedToolchain.toolchain.version,
747-
selectedPicotool ?? "2.2.0"
751+
selectedPicotool
748752
);
749753

750754
progress.report({

‎src/utils/download.mts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const TOOLS_RELEASES: { [key: string]: string } = {
7272
// eslint-disable-next-line @typescript-eslint/naming-convention
7373
"2.1.1": "v2.1.1-1",
7474
// eslint-disable-next-line @typescript-eslint/naming-convention
75-
"2.2.0": "v2.2.0-0",
75+
"2.2.0": "v2.2.0-1",
7676
};
7777

7878
/// Release tags for picotool
@@ -85,6 +85,8 @@ const PICOTOOL_RELEASES: { [key: string]: string } = {
8585
"2.1.1": "v2.1.1-1",
8686
// eslint-disable-next-line @typescript-eslint/naming-convention
8787
"2.2.0": "v2.2.0-0",
88+
// eslint-disable-next-line @typescript-eslint/naming-convention
89+
"2.2.0-a4": "v2.2.0-1",
8890
};
8991

9092
/// Release tags for openocd

‎src/utils/sharedConstants.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ export const WINDOWS_ARM64_PYTHON_DOWNLOAD_URL =
44
"https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-arm64.zip";
55
export const CURRENT_PYTHON_VERSION = "3.12.6";
66

7-
export const CURRENT_DATA_VERSION = "0.17.0";
7+
export const CURRENT_DATA_VERSION = "0.18.0";

0 commit comments

Comments
 (0)