Add wget wrapper workaround + Fix cmake auto configure for zephyr + fix git path inclusion

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

Author: paulober

.vscodeignore

@@ -35,6 +35,8 @@ node_modules/**
 !scripts/pico-vscode.cmake
 !scripts/Pico.code-profile
 !scripts/raspberrypi-swd.cfg
+!scripts/wget.cmd
+!scripts/wget.sh
 !data/**
 scripts/*.ps1
 scripts/fix_windows_reg.py

scripts/wget.cmd

@@ -0,0 +1,35 @@
+@echo off
+REM --- Simple wget wrapper using curl ---
+
+setlocal
+
+set QUIET=
+set OUTPUT=
+set URL=
+
+:parse
+if "%~1"=="" goto done
+if "%~1"=="-q" (
+  set QUIET=-s
+) else if "%~1"=="--show-progress" (
+  REM curl shows progress by default unless -s is set
+) else if "%~1"=="-N" (
+  REM ignore, wget -N is about timestamping
+) else if "%~1"=="-O" (
+  shift
+  set OUTPUT=-o %~1
+) else (
+  set URL=%~1
+)
+shift
+goto parse
+
+:done
+if "%URL%"=="" (
+  echo ERROR: No URL provided
+  exit /b 1
+)
+
+curl --retry 5 --retry-delay 5 --retry-connrefused %QUIET% -L %OUTPUT% %URL%
+
+endlocal

scripts/wget.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+# Simple wget wrapper using curl
+
+QUIET=""
+OUTPUT=""
+URL=""
+
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    -q) QUIET="-s" ;;
+    --show-progress) ;; # curl shows by default
+    -N) ;;              # ignore timestamping
+    -O) shift; OUTPUT="-o $1" ;;
+    *) URL="$1" ;;
+  esac
+  shift
+done
+
+if [ -z "$URL" ]; then
+  echo "ERROR: No URL provided" >&2
+  exit 1
+fi
+
+exec curl --retry 5 --retry-delay 5 --retry-connrefused $QUIET -L $OUTPUT "$URL"

src/commands/getPaths.mts

@@ -1,5 +1,5 @@
 import { CommandWithResult } from "./command.mjs";
-import { commands, FileType, Uri, window, workspace } from "vscode";
+import { commands, Uri, window, workspace } from "vscode";
 import {
   getPythonPath,
   getPath,
@@ -44,14 +44,16 @@ import {
   GET_ZEPHYR_SDK_PATH,
   GET_ZEPHYR_WORKSPACE_PATH,
 } from "./cmdIds.mjs";
-import { getBoardFromZephyrProject } from "../utils/setupZephyr.mjs";
+import {
+  getBoardFromZephyrProject,
+  getZephyrSDKVersion,
+} from "../utils/setupZephyr.mjs";
 import {
   ZEPHYR_PICO,
   ZEPHYR_PICO2,
   ZEPHYR_PICO2_W,
   ZEPHYR_PICO_W,
 } from "../models/zephyrBoards.mjs";
-import { compare } from "../utils/semverUtil.mjs";
 
 export class GetPythonPathCommand extends CommandWithResult<string> {
   constructor() {
@@ -85,9 +87,10 @@ export class GetEnvPathCommand extends CommandWithResult<string> {
       return "";
     }
 
-    const path = await getPath();
+    const env = await getPath();
+    const pathValue = process.platform === "win32" ? env.Path : env.PATH;
 
-    return path;
+    return JSON.stringify(pathValue ?? "");
   }
 }
 
@@ -603,13 +606,7 @@ export class GetZephyrWorkspacePathCommand extends CommandWithResult<
   }
 
   execute(): string | undefined {
-    const result = buildZephyrWorkspacePath();
-
-    if (result === null || !result) {
-      return undefined;
-    }
-
-    return result;
+    return buildZephyrWorkspacePath();
   }
 }
 
@@ -626,22 +623,12 @@ export class GetZephyrSDKPathCommand extends CommandWithResult<
     if (result === null || !result) {
       return undefined;
     }
-    const workspaceUri = Uri.file(result);
 
     try {
-      await workspace.fs.stat(workspaceUri);
-      const contents = await workspace.fs.readDirectory(workspaceUri);
-      // TODO: get zephr version form west manifest and sdk_version from zephyr directory
-      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]}`);
+      await workspace.fs.stat(Uri.file(result));
+      const zephyrSdkVersion = await getZephyrSDKVersion();
+
+      return joinPosix(result, `zephyr-sdk-${zephyrSdkVersion}`);
     } catch {
       return undefined;
     }

src/extension.mts

@@ -7,6 +7,7 @@ import {
   ProgressLocation,
   Uri,
   FileSystemError,
+  type WorkspaceFolder,
 } from "vscode";
 import {
   extensionName,
@@ -112,6 +113,7 @@ import {
   getZephyrVersion,
   setupZephyr,
   updateZephyrCompilerPath,
+  zephyrVerifyCMakCache,
 } from "./utils/setupZephyr.mjs";
 import { IMPORT_PROJECT } from "./commands/cmdIds.mjs";
 import {
@@ -398,7 +400,6 @@ export async function activate(context: ExtensionContext): Promise<void> {
         ninjaVersion = version;
       }
 
-      // TODO: read selected ninja and cmake versions from project
       const result = await setupZephyr({
         extUri: context.extensionUri,
         cmakeMode: cmakeVersion !== "" ? 2 : 3,
@@ -462,6 +463,8 @@ export async function activate(context: ExtensionContext): Promise<void> {
         // TODO: maybe cancel activation
       }
 
+      await zephyrVerifyCMakCache(workspaceFolder.uri);
+
       // Update the board info if it can be found in tasks.json
       const tasksJsonFilePath = join(
         workspaceFolder.uri.fsPath,
@@ -486,37 +489,44 @@ export async function activate(context: ExtensionContext): Promise<void> {
         }
       }
 
-      // check if build dir is empty and recommend to run a build to
-      // get the intellisense working
-      // TODO: maybe run cmake configure automatically if build folder empty
-      const buildUri = Uri.file(join(workspaceFolder.uri.fsPath, "build"));
-      try {
-        // workaround to stop verbose logging of readDirectory internals even if we catch the error
-        await workspace.fs.stat(buildUri);
-        const buildDirContents = await workspace.fs.readDirectory(buildUri);
-
-        if (buildDirContents.length === 0) {
-          void window.showWarningMessage(
-            "To get full intellisense support please build the project once."
-          );
-        }
-      } catch (error) {
-        if (error instanceof FileSystemError && error.code === "FileNotFound") {
-          void window.showWarningMessage(
-            "To get full intellisense support please build the project once."
-          );
-
-          Logger.debug(
-            LoggerSource.extension,
-            'No "build" folder found. Intellisense might not work ' +
-              "properly until a build has been done."
-          );
-        } else {
-          Logger.error(
-            LoggerSource.extension,
-            "Error when reading build folder:",
-            unknownErrorToString(error)
-          );
+      if (settings.getBoolean(SettingsKey.cmakeAutoConfigure)) {
+        await cmakeSetupAutoConfigure(workspaceFolder, ui);
+      } else {
+        // check if build dir is empty and recommend to run a build to
+        // get the intellisense working
+        const buildUri = Uri.file(join(workspaceFolder.uri.fsPath, "build"));
+        try {
+          // workaround to stop verbose logging of readDirectory
+          // internals even if we catch the error
+          await workspace.fs.stat(buildUri);
+          const buildDirContents = await workspace.fs.readDirectory(buildUri);
+
+          if (buildDirContents.length === 0) {
+            void window.showWarningMessage(
+              "To get full intellisense support please build the project once."
+            );
+          }
+        } catch (error) {
+          if (
+            error instanceof FileSystemError &&
+            error.code === "FileNotFound"
+          ) {
+            void window.showWarningMessage(
+              "To get full intellisense support please build the project once."
+            );
+
+            Logger.debug(
+              LoggerSource.extension,
+              'No "build" folder found. Intellisense might not work ' +
+                "properly until a build has been done."
+            );
+          } else {
+            Logger.error(
+              LoggerSource.extension,
+              "Error when reading build folder:",
+              unknownErrorToString(error)
+            );
+          }
         }
       }
 
@@ -1098,27 +1108,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
 
   // auto project configuration with cmake
   if (settings.getBoolean(SettingsKey.cmakeAutoConfigure)) {
-    //run `cmake -G Ninja -B ./build ` in the root folder
-    await configureCmakeNinja(workspaceFolder.uri);
-
-    const ws = workspaceFolder.uri.fsPath;
-    const cMakeCachePath = join(ws, "build", "CMakeCache.txt");
-    const newBuildType = cmakeGetPicoVar(cMakeCachePath, "CMAKE_BUILD_TYPE");
-    ui.updateBuildType(newBuildType ?? "unknown");
-
-    workspace.onDidChangeTextDocument(event => {
-      // Check if the changed document is the file you are interested in
-      if (basename(event.document.fileName) === "CMakeLists.txt") {
-        // File has changed, do something here
-        // TODO: rerun configure project
-        // TODO: maybe conflicts with cmake extension which also does this
-        Logger.debug(
-          LoggerSource.extension,
-          "File changed:",
-          event.document.fileName
-        );
-      }
-    });
+    await cmakeSetupAutoConfigure(workspaceFolder, ui);
   } else if (settings.getBoolean(SettingsKey.useCmakeTools)) {
     // Ensure the Pico kit is selected
     await cmakeToolsForcePicoKit();
@@ -1131,6 +1121,33 @@ export async function activate(context: ExtensionContext): Promise<void> {
   }
 }
 
+async function cmakeSetupAutoConfigure(
+  workspaceFolder: WorkspaceFolder,
+  ui: UI
+): Promise<void> {
+  //run `cmake -G Ninja -B ./build ` in the root folder
+  await configureCmakeNinja(workspaceFolder.uri);
+
+  const ws = workspaceFolder.uri.fsPath;
+  const cMakeCachePath = join(ws, "build", "CMakeCache.txt");
+  const newBuildType = cmakeGetPicoVar(cMakeCachePath, "CMAKE_BUILD_TYPE");
+  ui.updateBuildType(newBuildType ?? "unknown");
+
+  workspace.onDidChangeTextDocument(event => {
+    // Check if the changed document is the file you are interested in
+    if (basename(event.document.fileName) === "CMakeLists.txt") {
+      // File has changed, do something here
+      // TODO: rerun configure project
+      // TODO: maybe conflicts with cmake extension which also does this
+      Logger.debug(
+        LoggerSource.extension,
+        "File changed:",
+        event.document.fileName
+      );
+    }
+  });
+}
+
 /**
  * Make sure the executable has the .exe extension on Windows.
  *