From 9041cebcc0a0a7893a1b7d20d355044b27815cf8 Mon Sep 17 00:00:00 2001
From: doyle <doyle.github.2ifxi@simplelogin.com>
Date: Sun, 16 Apr 2023 00:01:24 +1000
Subject: [PATCH] Tweak scripts

---
 app_manifest_dev.py  | 23 ++++++++++++++---------
 win_portable_msvc.py |  6 +++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app_manifest_dev.py b/app_manifest_dev.py
index 193639d..0847a33 100644
--- a/app_manifest_dev.py
+++ b/app_manifest_dev.py
@@ -785,12 +785,14 @@ def get_manifest(is_windows):
 
     # --------------------------------------------------------------------------
 
-    version           = "16.19.0"
-    download_url      = ""
-    download_checksum = ""
-    exe_path          = ""
-    checksum          = ""
-    symlink           = []
+    label                = "NodeJS"
+    version              = "16.19.0"
+    download_url         = ""
+    download_checksum    = ""
+    exe_path             = ""
+    checksum             = ""
+    symlink              = []
+    add_to_devenv_script = []
 
     if is_windows:
         download_url      = f"https://nodejs.org/dist/v{version}/node-v{version}-win-x64.7z"
@@ -821,7 +823,7 @@ def get_manifest(is_windows):
                         "checksum": checksum,
                     }
                 ],
-                "add_to_devenv_script": [],
+                "add_to_devenv_script": add_to_devenv_script,
             }
         ],
     })
@@ -832,6 +834,9 @@ def get_manifest(is_windows):
         download_checksum = "cad3cc0910dc216e8b6dcfc3c5b3be0a619c2d4a4b29f2e674820b70e4f374dd"
         checksum          = "17fd75d8a41bf9b4c475143e19ff2808afa7a92f7502ede731537d9da674d5e8"
         symlink           = [f"node-{version}.exe"]
+        add_to_devenv_script = [
+            f"set PATH=%~dp0{label}\\{version}\\node_modules\\corepack\\shims;%PATH%",
+        ]
     else:
         download_url      = f"https://nodejs.org/dist/v{version}/node-v{version}-linux-x64.tar.xz"
         download_checksum = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -855,7 +860,7 @@ def get_manifest(is_windows):
                         "checksum": checksum,
                     }
                 ],
-                "add_to_devenv_script": [],
+                "add_to_devenv_script": add_to_devenv_script,
             }
         ],
     })
@@ -1807,7 +1812,7 @@ def get_manifest(is_windows):
                     {
                         "path": exe_path,
                         "symlink": symlink,
-                        "add_to_devenv_path": True,
+                        "add_to_devenv_path": False,
                         "checksum": checksum,
                     }
                 ],
diff --git a/win_portable_msvc.py b/win_portable_msvc.py
index c2545fc..e7e5847 100644
--- a/win_portable_msvc.py
+++ b/win_portable_msvc.py
@@ -9,6 +9,10 @@
 # folders, skip the downloading of MSVC or the SDK if we only need one of them).
 #
 # Changelog
+# 2023-04-15
+# - Fix "msvc-{version}.bat" script generating trailing "\;" on
+#   VCToolsInstallDir environment variable
+#
 # 2023-01-30
 # - Generate the short-hand version of the msvc-{version}.bat and
 #   win-sdk-{version}.bat using the versions passed as the argument parameter.
@@ -352,7 +356,7 @@ set MSVC_HOST=Host{HOST}
 set MSVC_ARCH={TARGET}
 set MSVC_ROOT=%~dp0VC\\Tools\\MSVC\\%MSVC_VERSION%
 
-set VCToolsInstallDir=%MSVC_ROOT%\\;%VCToolsInstallDir%
+set VCToolsInstallDir=%MSVC_ROOT%
 set PATH=%MSVC_ROOT%\\bin\\%MSVC_HOST%\\%MSVC_ARCH%;%PATH%
 set INCLUDE=%MSVC_ROOT%\\include;%INCLUDE%
 set LIB=%MSVC_ROOT%\\lib\\%MSVC_ARCH%;%LIB%