Add versioned zephyr sdk folders back

Signed-off-by: paulober <[email protected]>

Author: paulober

package.json

@@ -267,6 +267,12 @@
         "title": "Get path of the project release SBOM (rust only)",
         "category": "Raspberry Pi Pico",
         "enablement": "false"
+      },
+      {
+        "command": "raspberry-pi-pico.getZephyrSDKPath",
+        "title": "Get Zephyr SDK path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
       }
     ],
     "configuration": {

src/commands/cmdIds.mts

@@ -20,6 +20,7 @@ export const GET_OPENOCD_ROOT = "getOpenOCDRoot";
 export const GET_SVD_PATH = "getSVDPath";
 export const GET_WEST_PATH = "getWestPath";
 export const GET_ZEPHYR_WORKSPACE_PATH = "getZephyrWorkspacePath";
+export const GET_ZEPHYR_SDK_PATH = "getZephyrSDKPath";
 
 export const IMPORT_PROJECT = "importProject";
 

src/commands/getPaths.mts

@@ -1,5 +1,5 @@
 import { CommandWithResult } from "./command.mjs";
-import { commands, type Uri, window, workspace } from "vscode";
+import { commands, FileType, Uri, window, workspace } from "vscode";
 import {
   getPythonPath,
   getPath,
@@ -41,6 +41,7 @@ import {
   GET_SVD_PATH,
   GET_TARGET,
   GET_WEST_PATH,
+  GET_ZEPHYR_SDK_PATH,
   GET_ZEPHYR_WORKSPACE_PATH,
 } from "./cmdIds.mjs";
 import { getBoardFromZephyrProject } from "../utils/setupZephyr.mjs";
@@ -50,6 +51,7 @@ import {
   ZEPHYR_PICO2_W,
   ZEPHYR_PICO_W,
 } from "../models/zephyrBoards.mjs";
+import { compare } from "../utils/semverUtil.mjs";
 
 export class GetPythonPathCommand extends CommandWithResult<string> {
   constructor() {
@@ -610,3 +612,37 @@ export class GetZephyrWorkspacePathCommand extends CommandWithResult<
     return result;
   }
 }
+
+export class GetZephyrSDKPathCommand extends CommandWithResult<
+  string | undefined
+> {
+  constructor() {
+    super(GET_ZEPHYR_SDK_PATH);
+  }
+
+  async execute(): Promise<string | undefined> {
+    const result = buildZephyrWorkspacePath();
+
+    if (result === null || !result) {
+      return undefined;
+    }
+    const workspaceUri = Uri.file(result);
+
+    try {
+      await workspace.fs.stat(workspaceUri);
+      const contents = await workspace.fs.readDirectory(workspaceUri);
+      const sdksDirectories = contents
+        .filter(
+          entry =>
+            entry[1] === FileType.Directory &&
+            entry[0].startsWith("zephyr-sdk-")
+        )
+        .map(([name]) => name.replace(/^zephyr-sdk-/, ""))
+        .sort((a, b) => compare(b, a)); // sort descending
+
+      return joinPosix(result, `zephyr-sdk-${sdksDirectories[0]}`);
+    } catch {
+      return undefined;
+    }
+  }
+}

src/extension.mts

@@ -54,6 +54,7 @@ import {
   GetSVDPathCommand,
   GetWestPathCommand,
   GetZephyrWorkspacePathCommand,
+  GetZephyrSDKPathCommand,
 } from "./commands/getPaths.mjs";
 import {
   downloadAndInstallCmake,
@@ -158,6 +159,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     new GetSVDPathCommand(context.extensionUri),
     new GetWestPathCommand(),
     new GetZephyrWorkspacePathCommand(),
+    new GetZephyrSDKPathCommand(),
     new CompileProjectCommand(),
     new RunProjectCommand(),
     new FlashProjectSWDCommand(),

src/utils/setupZephyr.mts

@@ -62,8 +62,6 @@ interface ZephyrSetupOutputs {
 const homeDirectory: string = homedir();
 
 const zephyrManifestContent: string = `
-# Copyright (c) 2021 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
 manifest:
   self:
     west-commands: scripts/west-commands.yml
@@ -1240,7 +1238,7 @@ export async function setupZephyr(
           cancellable: false,
         },
         async progress2 => {
-          // was -b ${zephyrWorkspaceDirectory} which results in zephyr-sdk-<version> in it
+          // was  which results in zephyr-sdk-<version> in it
           let westInstallSDKCommand: string = `"${westExe}" sdk install `;
 
           const githubPat = Settings.getInstance()?.getString(
@@ -1254,9 +1252,10 @@ export async function setupZephyr(
             );
             westInstallSDKCommand += `--personal-access-token ${githubPat} `;
           }
+          //`-d "${zephyrWorkspaceDirectory}/zephyr-sdk"`;
           westInstallSDKCommand +=
-            "-t arm-zephyr-eabi " +
-            `-d "${zephyrWorkspaceDirectory}/zephyr-sdk"`;
+            // -b ${} results in zephyr-sdk-<version> folder
+            "-t arm-zephyr-eabi -b ${zephyrWorkspaceDirectory}";
 
           result = await _runCommand(westInstallSDKCommand, {
             cwd: zephyrWorkspaceDirectory,