From 54aac5b10c76991d1fb00c708d23c1d1da3110d6 Mon Sep 17 00:00:00 2001
From: doylet <doyle.github.2ifxi@simplelogin.com>
Date: Wed, 7 Feb 2024 11:19:29 +1100
Subject: [PATCH] Add NodeJS 12.22.12, update scripts to provide environment

---
 Win/Scripts/node-12.22.12_env.bat             |  6 +++
 Win/Scripts/node-16.19.0_env.bat              |  4 ++
 Win/Scripts/node-18.15.0_env.bat              |  6 +++
 .../{yarn-nodejs-16.19.0.bat => raddbg.bat}   |  6 +--
 app_manifest_dev.py                           | 48 ++++++++++---------
 5 files changed, 45 insertions(+), 25 deletions(-)
 create mode 100644 Win/Scripts/node-12.22.12_env.bat
 create mode 100644 Win/Scripts/node-16.19.0_env.bat
 create mode 100644 Win/Scripts/node-18.15.0_env.bat
 rename Win/Scripts/{yarn-nodejs-16.19.0.bat => raddbg.bat} (61%)

diff --git a/Win/Scripts/node-12.22.12_env.bat b/Win/Scripts/node-12.22.12_env.bat
new file mode 100644
index 0000000..24a7db5
--- /dev/null
+++ b/Win/Scripts/node-12.22.12_env.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+  set path=%devenver_root%\NodeJS\12.22.12;%path%
+  echo [DEVENVER] Executing script "%~dpnx0" with "%*"
+  call %*
+endlocal
diff --git a/Win/Scripts/node-16.19.0_env.bat b/Win/Scripts/node-16.19.0_env.bat
new file mode 100644
index 0000000..69cd72b
--- /dev/null
+++ b/Win/Scripts/node-16.19.0_env.bat
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+  call %devenver_root%\raddbg\trunk\raddbg.exe --user %devenver_root%\raddbg\doylet.raddbg_user
+endlocal
diff --git a/Win/Scripts/node-18.15.0_env.bat b/Win/Scripts/node-18.15.0_env.bat
new file mode 100644
index 0000000..185eef2
--- /dev/null
+++ b/Win/Scripts/node-18.15.0_env.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+  set path=%devenver_root%\NodeJS\18.15.0;%path%
+  echo [DEVENVER] Executing script "%~dpnx0" with "%exe_to_use%"
+  call %*
+endlocal
diff --git a/Win/Scripts/yarn-nodejs-16.19.0.bat b/Win/Scripts/raddbg.bat
similarity index 61%
rename from Win/Scripts/yarn-nodejs-16.19.0.bat
rename to Win/Scripts/raddbg.bat
index 0d10470..45566fc 100644
--- a/Win/Scripts/yarn-nodejs-16.19.0.bat
+++ b/Win/Scripts/raddbg.bat
@@ -1,12 +1,12 @@
 @echo off
 setlocal
-  set desired_path=%devenver_root%\NodeJS\16.19.0
-  set desired_exe=yarn
+  set desired_path=%devenver_root%\raddbg\trunk
+  set desired_exe=raddbg.exe
 
   set path=%desired_path%;%path%
   set exe_to_use=""
   for /f "delims=" %%a in ('where "$desired_path:%desired_exe%"') do ( set "exe_to_use=%%a")
   echo [DEVENVER] Executing script "%~dpnx0" with "%exe_to_use%"
 
-  call %desired_exe% %*
+  start /B %desired_exe% --user:%desired_path%\..\doylet.raddbg_user %*
 endlocal
diff --git a/app_manifest_dev.py b/app_manifest_dev.py
index eddf6d2..3eaf61e 100644
--- a/app_manifest_dev.py
+++ b/app_manifest_dev.py
@@ -861,32 +861,36 @@ def get_manifest(is_windows):
         ],
     })
 
-    if not is_windows:
-        version           = "12.22.12"
+    version = "12.22.12"
+    if is_windows:
+        download_url      = f"https://nodejs.org/dist/v{version}/node-v{version}-win-x64.7z"
+        download_checksum = "95f969cafbe02eb91e9d375899518b8e517f9f16300d040ac89fdaf4b881ba8d"
+        checksum          = "b014e4ec5ca810b2fb54cdbf6ab8d6acc488285c98469606efb8b412472bec2a"
+    else:
         download_url      = f"https://nodejs.org/dist/v{version}/node-v{version}-linux-x64.tar.xz"
         download_checksum = "e6d052364bfa2c17da92cf31794100cfd709ba147415ddaeed2222eec9ca1469"
         checksum          = "5a3c51dbee8fdd7201fe7b531f03262754b9b9fb1008f4c824e8d649c4e9c96b"
 
-        result.append({
-            "label": "NodeJS",
-            "manifests": [
-                {
-                    "download_checksum": download_checksum,
-                    "download_url": download_url,
-                    "version": version,
-                    "unzip_method": 'default',
-                    "executables": [
-                        {
-                            "path": exe_path,
-                            "symlink": symlink,
-                            "add_to_devenv_path": True,
-                            "checksum": checksum,
-                        }
-                    ],
-                    "add_to_devenv_script": add_to_devenv_script,
-                }
-            ],
-        })
+    result.append({
+        "label": "NodeJS",
+        "manifests": [
+            {
+                "download_checksum": download_checksum,
+                "download_url": download_url,
+                "version": version,
+                "unzip_method": 'default',
+                "executables": [
+                    {
+                        "path": exe_path,
+                        "symlink": symlink,
+                        "add_to_devenv_path": True,
+                        "checksum": checksum,
+                    }
+                ],
+                "add_to_devenv_script": add_to_devenv_script,
+            }
+        ],
+    })
 
     # --------------------------------------------------------------------------