Update picotool shell version when switching SDK

Also fix line endings when switching SDK

Author: will-v-pi

scripts/pico_project.py

@@ -1058,8 +1058,8 @@ def generateProjectFiles(
                 "{codeSdkPath(sdkVersion)}/**"
             ],
             "forcedInclude": [
-                "{codeSdkPath(sdkVersion)}/src/common/{base_headers_folder_name}/include/pico.h",
-                "${{workspaceFolder}}/build/generated/pico_base/pico/config_autogen.h"
+                "${{workspaceFolder}}/build/generated/pico_base/pico/config_autogen.h",
+                "{codeSdkPath(sdkVersion)}/src/common/{base_headers_folder_name}/include/pico.h"
             ],
             "defines": [],
             "compilerPath": "{cPath}",

src/utils/cmakeUtil.mts

@@ -12,6 +12,7 @@ import { homedir } from "os";
 import which from "which";
 import { compareLt } from "./semverUtil.mjs";
 import { buildCMakeIncPath } from "./download.mjs";
+import {EOL} from "os";
 
 export const CMAKE_DO_NOT_EDIT_HEADER_PREFIX =
   // eslint-disable-next-line max-len
@@ -350,19 +351,19 @@ export async function cmakeUpdateSDK(
 
     let modifiedContent = content.replace(
       updateSectionRegex,
-      `# ${CMAKE_DO_NOT_EDIT_HEADER_PREFIX}\n` +
-        "if(WIN32)\n" +
-        "    set(USERHOME $ENV{USERPROFILE})\n" +
-        "else()\n" +
-        "    set(USERHOME $ENV{HOME})\n" +
-        "endif()\n" +
-        `set(sdkVersion ${newSDKVersion})\n` +
-        `set(toolchainVersion ${newToolchainVersion})\n` +
-        `set(picotoolVersion ${newPicotoolVersion})\n` +
-        `set(picoVscode ${buildCMakeIncPath(false)}/pico-vscode.cmake)\n` +
-        "if (EXISTS ${picoVscode})\n" +
-        "    include(${picoVscode})\n" +
-        "endif()\n" +
+      `# ${CMAKE_DO_NOT_EDIT_HEADER_PREFIX}` + EOL +
+        "if(WIN32)" + EOL +
+        "    set(USERHOME $ENV{USERPROFILE})" + EOL +
+        "else()" + EOL +
+        "    set(USERHOME $ENV{HOME})" + EOL +
+        "endif()" + EOL +
+        `set(sdkVersion ${newSDKVersion})` + EOL +
+        `set(toolchainVersion ${newToolchainVersion})` + EOL +
+        `set(picotoolVersion ${newPicotoolVersion})` + EOL +
+        `set(picoVscode ${buildCMakeIncPath(false)}/pico-vscode.cmake)` + EOL +
+        "if (EXISTS ${picoVscode})" + EOL +
+        "    include(${picoVscode})" + EOL +
+        "endif()" + EOL +
         // eslint-disable-next-line max-len
         "# ===================================================================================="
     );

src/utils/vscodeConfigUtil.mts

@@ -6,6 +6,7 @@ import { type WorkspaceConfiguration, workspace } from "vscode";
 import { dirname } from "path/posix";
 import { compareGe } from "./semverUtil.mjs";
 import { extensionName } from "../commands/command.mjs";
+import {EOL} from "os";
 
 interface Configuration {
   includePath: string[];
@@ -58,11 +59,12 @@ async function updateCppPropertiesFile(
               ? "riscv32-corev-elf-gcc"
               : "riscv32-unknown-elf-gcc"
             : "arm-none-eabi-gcc"
-        }`;
+        }${config.compilerPath.endsWith(".exe") ? ".exe" : ""}`;
     });
 
     // Write the updated JSON back to the file
-    const updatedJsonData = JSON.stringify(cppProperties, null, 4);
+    const updatedJsonData =
+      (JSON.stringify(cppProperties, null, 4) + EOL).replace(/\r?\n/g, EOL);
     await writeFile(file, updatedJsonData, "utf8");
 
     console.log("cpp_properties.json file updated successfully.");
@@ -148,6 +150,7 @@ async function updateSettingsFile(
     Logger.debug(LoggerSource.vscodeConfigUtil, `Oldpath: ${oldPath}`);
     const pathList = oldPath.split(key.includes("windows") ? ";" : ":");
     let toolchainIdx = -1;
+    let picotoolIdx = -1;
     let cmakeIdx = -1;
     let ninjaIdx = -1;
 
@@ -158,6 +161,9 @@ async function updateSettingsFile(
       if (item.includes(".pico-sdk/toolchain")) {
         toolchainIdx = i;
       }
+      if (item.includes(".pico-sdk/picotool")) {
+        picotoolIdx = i;
+      }
       if (item.includes(".pico-sdk/cmake")) {
         cmakeIdx = i;
       }
@@ -173,6 +179,17 @@ async function updateSettingsFile(
 
     pathList[toolchainIdx] = currentValue["PICO_TOOLCHAIN_PATH"] + "/bin";
 
+    if (newSDKVersion) {
+      const newPicotoolPath = `\${${
+        key.includes("windows") ? "env:USERPROFILE" : "env:HOME"
+      }}/.pico-sdk/picotool/${newSDKVersion}/picotool`;
+      if (picotoolIdx > 0) {
+        pathList[picotoolIdx] = newPicotoolPath;
+      } else {
+        pathList.splice(pathList.length - 1, 0, newPicotoolPath);
+      }
+    }
+
     if (newCMakeVersion && newCMakeVersion !== "cmake") {
       let newCmakePath = "";
       if (!newCMakeVersion.includes("/")) {