From c250e703f7f0a9743ebeac410c8c6c8b21582bda Mon Sep 17 00:00:00 2001
From: evgeny <evgeny@adaptto.ru>
Date: Sun, 11 Oct 2026 00:22:18 +0200
Subject: [PATCH] Create VibeChat installer from Windows BAT entry points

---
 build.bat               | 14 ++++++++++----
 build_full.bat          | 16 +++++++++++-----
 tools/chatgui/build.bat | 17 ++++++++++-------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/build.bat b/build.bat
index 147b0d35..84b3d54b 100644
--- a/build.bat
+++ b/build.bat
@@ -1,4 +1,5 @@
 @echo off
+setlocal EnableExtensions
 echo uTun Build Script for MSYS2 UCRT64
 echo.
 
@@ -10,11 +11,11 @@ rem export https_proxy="http://192.168.29.1:9999"
 
 
 REM Default MSYS2 path
-set MSYS2_PATH=C:\msys64
+set "MSYS2_PATH=C:\msys64"
 
 REM Use environment variable if set
-if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT%
-if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2%
+if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
+if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
 
 REM Check if msys2_shell.cmd exists
 if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
@@ -22,10 +23,15 @@ if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
     echo Please install MSYS2 from https://www.msys2.org/
     echo or set MSYS2_ROOT environment variable.
     pause
+    popd
     exit /b 1
 )
 
 REM Launch MSYS2 UCRT64 shell and run build script
 echo Starting MSYS2 UCRT64 environment...
 rem call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -c "bash build.sh > build_win.log 2>&1"
-call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; bash build.sh 2>&1 | tee build_win.log"
+call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; bash build.sh --installer 2>&1 | tee build_win.log"
+set "BUILD_RESULT=%ERRORLEVEL%"
+if not "%BUILD_RESULT%"=="0" echo [ERROR] Build or installer failed. See build_win.log.
+popd
+endlocal & exit /b %BUILD_RESULT%
diff --git a/build_full.bat b/build_full.bat
index edcab3cd..11cf47e9 100644
--- a/build_full.bat
+++ b/build_full.bat
@@ -1,4 +1,5 @@
 @echo off
+setlocal EnableExtensions
 echo uTun Full Build Script for MSYS2 UCRT64
 echo =========================================
 echo This will regenerate build system with autoreconf
@@ -11,11 +12,11 @@ rem export https_proxy="http://192.168.29.1:9999"
 
 
 REM Default MSYS2 path
-set MSYS2_PATH=C:\msys64
+set "MSYS2_PATH=C:\msys64"
 
 REM Use environment variable if set
-if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT%
-if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2%
+if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
+if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
 
 REM Check if msys2_shell.cmd exists
 if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
@@ -23,11 +24,16 @@ if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
     echo Please install MSYS2 from https://www.msys2.org/
     echo or set MSYS2_ROOT environment variable.
     pause
+    popd
     exit /b 1
 )
 
 REM Launch MSYS2 UCRT64 shell and run build script with --full flag
 echo Starting MSYS2 UCRT64 environment for FULL REBUILD...
-echo Running: bash build.sh --full
+echo Running: bash build.sh --full --installer
 echo.
-call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; bash build.sh --full 2>&1 | tee build_full.log"
+call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; bash build.sh --full --installer 2>&1 | tee build_full.log"
+set "BUILD_RESULT=%ERRORLEVEL%"
+if not "%BUILD_RESULT%"=="0" echo [ERROR] Build or installer failed. See build_full.log.
+popd
+endlocal & exit /b %BUILD_RESULT%
diff --git a/tools/chatgui/build.bat b/tools/chatgui/build.bat
index 36283c7f..2e0882f0 100644
--- a/tools/chatgui/build.bat
+++ b/tools/chatgui/build.bat
@@ -1,19 +1,21 @@
 @echo off
+setlocal EnableExtensions
 pushd "%~dp0\..\.."
 
 echo ChatGUI Build Script for MSYS2 UCRT64
 echo ===========================================
 echo.
 
-set MSYS2_PATH=C:\msys64
-if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT%
-if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2%
+set "MSYS2_PATH=C:\msys64"
+if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
+if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
 
 if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
     echo [ERROR] MSYS2 not found at %MSYS2_PATH%
     echo Please install MSYS2 from https://www.msys2.org/
     echo or set MSYS2_ROOT environment variable.
     pause
+    popd
     exit /b 1
 )
 
@@ -21,17 +23,16 @@ echo [INFO] MSYS2 found at: %MSYS2_PATH%
 echo [INFO] Starting build...
 echo.
 
-set "CURRENT_DIR=%CD%"
+call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; cd tools/chatgui && bash build.sh --installer 2>&1 | tee build_win.log"
 
-call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -defterm -no-start -c "set -o pipefail; cd \"%CURRENT_DIR%/tools/chatgui\" && bash build.sh 2>&1 | tee build_win.log"
-
-set BUILD_RESULT=%ERRORLEVEL%
+set "BUILD_RESULT=%ERRORLEVEL%"
 
 echo.
 echo ===========================================
 if %BUILD_RESULT% == 0 (
     echo [SUCCESS] Build completed!
     echo [INFO] Executable: tools\chatgui\build\vibechat.exe
+    echo [INFO] Installer: tools\chatgui\build\installer\VibeChat-*-win64-setup.exe
 ) else (
     echo [FAILED] Build failed with error code: %BUILD_RESULT%
     echo [INFO] Check tools\chatgui\build_win.log for details
@@ -40,3 +41,5 @@ echo ===========================================
 echo.
 
 pause
+popd
+endlocal & exit /b %BUILD_RESULT%