jeka
/
utun2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Create VibeChat installer from Windows BAT entry points

master
evgeny 2 days ago
parent
197696075c
commit
c250e703f7
3 changed files with 31 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      build.bat
  2. 16
      build_full.bat
  3. 17
      tools/chatgui/build.bat

14
build.bat
Unescape View File

@ -1,4 +1,5 @@
@echo off @echo off
setlocal EnableExtensions
echo uTun Build Script for MSYS2 UCRT64 echo uTun Build Script for MSYS2 UCRT64
echo. echo.
@ -10,11 +11,11 @@ rem export https_proxy="http://192.168.29.1:9999"
REM Default MSYS2 path REM Default MSYS2 path
set MSYS2_PATH=C:\msys64 set "MSYS2_PATH=C:\msys64"
REM Use environment variable if set REM Use environment variable if set
if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT% if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2% if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
REM Check if msys2_shell.cmd exists REM Check if msys2_shell.cmd exists
if not exist "%MSYS2_PATH%\msys2_shell.cmd" ( 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 Please install MSYS2 from https://www.msys2.org/
echo or set MSYS2_ROOT environment variable. echo or set MSYS2_ROOT environment variable.
pause pause
popd
exit /b 1 exit /b 1
) )
REM Launch MSYS2 UCRT64 shell and run build script REM Launch MSYS2 UCRT64 shell and run build script
echo Starting MSYS2 UCRT64 environment... echo Starting MSYS2 UCRT64 environment...
rem call "%MSYS2_PATH%\msys2_shell.cmd" -ucrt64 -here -c "bash build.sh > build_win.log 2>&1" 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%

16
build_full.bat
Unescape View File

@ -1,4 +1,5 @@
@echo off @echo off
setlocal EnableExtensions
echo uTun Full Build Script for MSYS2 UCRT64 echo uTun Full Build Script for MSYS2 UCRT64
echo ========================================= echo =========================================
echo This will regenerate build system with autoreconf 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 REM Default MSYS2 path
set MSYS2_PATH=C:\msys64 set "MSYS2_PATH=C:\msys64"
REM Use environment variable if set REM Use environment variable if set
if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT% if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2% if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
REM Check if msys2_shell.cmd exists REM Check if msys2_shell.cmd exists
if not exist "%MSYS2_PATH%\msys2_shell.cmd" ( 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 Please install MSYS2 from https://www.msys2.org/
echo or set MSYS2_ROOT environment variable. echo or set MSYS2_ROOT environment variable.
pause pause
popd
exit /b 1 exit /b 1
) )
REM Launch MSYS2 UCRT64 shell and run build script with --full flag REM Launch MSYS2 UCRT64 shell and run build script with --full flag
echo Starting MSYS2 UCRT64 environment for FULL REBUILD... echo Starting MSYS2 UCRT64 environment for FULL REBUILD...
echo Running: bash build.sh --full echo Running: bash build.sh --full --installer
echo. 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%

17
tools/chatgui/build.bat
Unescape View File

@ -1,19 +1,21 @@
@echo off @echo off
setlocal EnableExtensions
pushd "%~dp0\..\.." pushd "%~dp0\..\.."
echo ChatGUI Build Script for MSYS2 UCRT64 echo ChatGUI Build Script for MSYS2 UCRT64
echo =========================================== echo ===========================================
echo. echo.
set MSYS2_PATH=C:\msys64 set "MSYS2_PATH=C:\msys64"
if not "%MSYS2_ROOT%"=="" set MSYS2_PATH=%MSYS2_ROOT% if not "%MSYS2_ROOT%"=="" set "MSYS2_PATH=%MSYS2_ROOT%"
if not "%MSYS2%"=="" set MSYS2_PATH=%MSYS2% if not "%MSYS2%"=="" set "MSYS2_PATH=%MSYS2%"
if not exist "%MSYS2_PATH%\msys2_shell.cmd" ( if not exist "%MSYS2_PATH%\msys2_shell.cmd" (
echo [ERROR] MSYS2 not found at %MSYS2_PATH% echo [ERROR] MSYS2 not found at %MSYS2_PATH%
echo Please install MSYS2 from https://www.msys2.org/ echo Please install MSYS2 from https://www.msys2.org/
echo or set MSYS2_ROOT environment variable. echo or set MSYS2_ROOT environment variable.
pause pause
popd
exit /b 1 exit /b 1
) )
@ -21,17 +23,16 @@ echo [INFO] MSYS2 found at: %MSYS2_PATH%
echo [INFO] Starting build... echo [INFO] Starting build...
echo. 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.
echo =========================================== echo ===========================================
if %BUILD_RESULT% == 0 ( if %BUILD_RESULT% == 0 (
echo [SUCCESS] Build completed! echo [SUCCESS] Build completed!
echo [INFO] Executable: tools\chatgui\build\vibechat.exe echo [INFO] Executable: tools\chatgui\build\vibechat.exe
echo [INFO] Installer: tools\chatgui\build\installer\VibeChat-*-win64-setup.exe
) else ( ) else (
echo [FAILED] Build failed with error code: %BUILD_RESULT% echo [FAILED] Build failed with error code: %BUILD_RESULT%
echo [INFO] Check tools\chatgui\build_win.log for details echo [INFO] Check tools\chatgui\build_win.log for details
@ -40,3 +41,5 @@ echo ===========================================
echo. echo.
pause pause
popd
endlocal & exit /b %BUILD_RESULT%

Write Preview
Loading…
Cancel
Save