Use project ninja and cmake for zephyr setup on project opening

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

Author: paulober

src/extension.mts

@@ -259,7 +259,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     return;
   }
 
-  void commands.executeCommand(
+  await commands.executeCommand(
     "setContext",
     ContextKeys.isRustProject,
     isRustProject
@@ -315,15 +315,102 @@ export async function activate(context: ExtensionContext): Promise<void> {
         return;
       }
 
+      const cmakePath = settings.getString(SettingsKey.cmakePath);
+      // TODO: or auto upgrade to latest cmake
+      if (cmakePath === undefined) {
+        Logger.error(
+          LoggerSource.extension,
+          "CMake path not set in settings. Cannot setup Zephyr project."
+        );
+        void window.showErrorMessage(
+          "CMake path not set in settings. Cannot setup Zephyr project."
+        );
+        await commands.executeCommand(
+          "setContext",
+          ContextKeys.isPicoProject,
+          false
+        );
+
+        return;
+      }
+      let cmakeVersion = "";
+      if (cmakePath && cmakePath.includes("/.pico-sdk/cmake")) {
+        const version = /\/\.pico-sdk\/cmake\/([v.0-9A-Za-z-]+)\//.exec(
+          cmakePath
+        )?.[1];
+
+        if (version === undefined) {
+          Logger.error(
+            LoggerSource.extension,
+            "Failed to get CMake version from path in the settings."
+          );
+          await commands.executeCommand(
+            "setContext",
+            ContextKeys.isPicoProject,
+            false
+          );
+
+          return;
+        }
+
+        cmakeVersion = version;
+      }
+
+      const ninjaPath = settings.getString(SettingsKey.ninjaPath);
+      let ninjaVersion = "";
+      if (ninjaPath === undefined) {
+        Logger.error(
+          LoggerSource.extension,
+          "Ninja path not set in settings. Cannot setup Zephyr project."
+        );
+        void window.showErrorMessage(
+          "Ninja path not set in settings. Cannot setup Zephyr project."
+        );
+        await commands.executeCommand(
+          "setContext",
+          ContextKeys.isPicoProject,
+          false
+        );
+
+        return;
+      } else if (ninjaPath && ninjaPath.includes("/.pico-sdk/ninja")) {
+        const version = /\/\.pico-sdk\/ninja\/([v.0-9]+)\//.exec(
+          ninjaPath
+        )?.[1];
+        if (version === undefined) {
+          Logger.error(
+            LoggerSource.extension,
+            "Failed to get Ninja version from path in the settings."
+          );
+          await commands.executeCommand(
+            "setContext",
+            ContextKeys.isPicoProject,
+            false
+          );
+
+          return;
+        }
+
+        ninjaVersion = version;
+      }
+
       // TODO: read selected ninja and cmake versions from project
       const result = await setupZephyr({
         extUri: context.extensionUri,
-        cmakeMode: 4,
-        cmakePath: "",
-        cmakeVersion: latest[1].cmake,
-        ninjaMode: 4,
-        ninjaPath: "",
-        ninjaVersion: latest[1].ninja,
+        cmakeMode: cmakeVersion !== "" ? 2 : 3,
+        cmakePath:
+          cmakeVersion !== ""
+            ? ""
+            : cmakePath.replace(HOME_VAR, homedir().replaceAll("\\", "/")) ??
+              "",
+        cmakeVersion: cmakeVersion,
+        ninjaMode: ninjaVersion !== "" ? 2 : 3,
+        ninjaPath:
+          ninjaVersion !== ""
+            ? ""
+            : ninjaPath.replace(HOME_VAR, homedir().replaceAll("\\", "/")) ??
+              "",
+        ninjaVersion: ninjaVersion,
       });
       if (result === undefined) {
         void window.showErrorMessage(

src/utils/githubREST.mts

@@ -308,25 +308,27 @@ export async function getNinjaReleases(): Promise<string[]> {
   // sort (they are in form vX.Y.Z) and some are
   // release-DDMMYYYY (these are the very old ones)
   return releases.then(rel =>
-    rel.sort((a, b) => {
-      const aParts = a
-        .replace(/^v/, "")
-        .split(/[-.]/)
-        .map(n => parseInt(n, 10));
-      const bParts = b
-        .replace(/^v/, "")
-        .split(/[-.]/)
-        .map(n => parseInt(n, 10));
-      for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
-        const aPart = aParts[i] ?? 0;
-        const bPart = bParts[i] ?? 0;
-        if (aPart !== bPart) {
-          return bPart - aPart; // descending order
+    rel
+      .filter(v => !v.startsWith("release"))
+      .sort((a, b) => {
+        const aParts = a
+          .replace(/^v/, "")
+          .split(/[-.]/)
+          .map(n => parseInt(n, 10));
+        const bParts = b
+          .replace(/^v/, "")
+          .split(/[-.]/)
+          .map(n => parseInt(n, 10));
+        for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+          const aPart = aParts[i] ?? 0;
+          const bPart = bParts[i] ?? 0;
+          if (aPart !== bPart) {
+            return bPart - aPart; // descending order
+          }
         }
-      }
 
-      return 0;
-    })
+        return 0;
+      })
   );
 }
 

src/utils/projectGeneration/projectZephyr.mts

@@ -206,7 +206,7 @@ async function generateVSCodeConfig(
   const posixHomedir = homedir().replaceAll("\\", "/");
   if (ninjaPath.length > 0) {
     const ninjaDir = dirnamePosix(ninjaPath);
-    settings[`${extensionName}.ninjaPath`] = ninjaDir.replace(
+    settings[`${extensionName}.ninjaPath`] = ninjaPath.replace(
       posixHomedir,
       HOME_VAR
     );