update path hunting on Windows

ironsheep · Dec 13, 2024 · 3807d99 · 3807d99
1 parent 5f5c1ea
commit 3807d99
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md
@@ -19,6 +19,13 @@ Possible next additions:
 - Add new-file templates as Snippets
 - Add additional Snippets as the community identifies them
 
+## [2.3.2] 2024-12-12
+
+Minor updates to Compiler detection for P1/P2 on Windows
+
+- Repair parsing of PATH on windows and how expected location paths are created
+- Extension logging is enabled for now to help us diagnose new-user installations
+
 ## [2.3.1] 2024-12-12
 
 Minor updates to Compiler detection for P1/P2

diff --git a/spin2/client/src/extension.ts b/spin2/client/src/extension.ts
@@ -1100,17 +1100,17 @@ async function locateTools(): Promise<void> {
   const optLocalBin = path.join(`${path.sep}opt`, 'local', 'bin');
   let platformPaths: string[] = [];
   if (isWindows()) {
-    const envDirs = envPath.split(':').filter(Boolean);
+    const envDirs = envPath.split(';').filter(Boolean); // Windows is ';' separated
     // C:\Program Files (x86)\Parallax Inc\PNut
     // C:\Programs\IronSheepProductions\pnut_ts
     // C:\Programs\TotalSpectrum\flexprop
-    const appFlexProp = path.join(`${path.sep}Programs`, 'TotalSpectrum', 'flexprop', 'bin');
-    const appPNutTS = path.join(`${path.sep}Programs`, 'IronSheepProductions', 'pnut_ts');
-    const appParallax = path.join(`${path.sep}Program Files (x86)`, 'Parallax Inc');
+    const appFlexProp = path.join(`C:${path.sep}Programs`, 'TotalSpectrum', 'flexprop', 'bin');
+    const appPNutTS = path.join(`C:${path.sep}Programs`, 'IronSheepProductions', 'pnut_ts');
+    const appParallax = path.join(`C:${path.sep}Program Files (x86)`, 'Parallax Inc');
     const appPNut = path.join(`${appParallax}`, 'PNut');
     platformPaths = [...envDirs, appParallax, appPNut, appPNutTS, appFlexProp];
   } else if (isMac()) {
-    const envDirs = envPath.split(':').filter(Boolean);
+    const envDirs = envPath.split(':').filter(Boolean); // macOS is ':' separated
     // /Applications/flexprop/bin
     // /Applications
     // ~/Applications
@@ -1123,7 +1123,7 @@ async function locateTools(): Promise<void> {
     // assume linux, RPi
     //  /opt/flexprop
     //  /opt/pnut_ts
-    const envDirs = envPath.split(':').filter(Boolean);
+    const envDirs = envPath.split(':').filter(Boolean); // linux is ':' separated
     const optPNutTS = path.join(`${path.sep}opt`, 'pnut_ts');
     const optFlexpropBin = path.join(`${path.sep}opt`, 'flexprop', 'bin');
     platformPaths = [...envDirs, userBin, userLocalBin, optFlexpropBin, optPNutTS];

diff --git a/spin2/package.json b/spin2/package.json
@@ -5,7 +5,7 @@
   "icon": "images/Propeller.ico",
   "author": "IronSheep",
   "license": "MIT",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ironsheep/P2-vscode-langserv-extension"