Build - use explicit paths in win bat files

Author: samaaron

app/win-build-all.bat

@@ -2,9 +2,20 @@ set WORKING_DIR=%CD%
 set CONFIG=%1
 if /I "%CONFIG%" == "" (set CONFIG=Release)
 
-call win-prebuild.bat
-call win-config.bat %CONFIG%
-call win-build-gui.bat %CONFIG%
-call win-post-tau-prod-release.bat
+call "%~dp0win-prebuild.bat"
+if errorlevel 1 goto :build_failed
+call "%~dp0win-config.bat" %CONFIG%
+if errorlevel 1 goto :build_failed
+call "%~dp0win-build-gui.bat" %CONFIG%
+if errorlevel 1 goto :build_failed
+call "%~dp0win-post-tau-prod-release.bat"
+if errorlevel 1 goto :build_failed
 
 cd %WORKING_DIR%
+exit /b 0
+
+:build_failed
+@echo.
+@echo *** Build FAILED with errorlevel %errorlevel% ***
+cd %WORKING_DIR%
+exit /b %errorlevel%

app/win-config.bat

@@ -2,12 +2,12 @@ set WORKING_DIR=%CD%
 set CONFIG=%1
 set SCRIPT_DIR=%~dp0
 cd %~dp0
-if /I "%CONFIG%" == "" (set CONFIG=Release)
+if /I "%CONFIG%" == "" set CONFIG=Release
 
-@echo "Creating build directory..."
+echo "Creating build directory..."
 mkdir build > nul
 
-@echo "Generating project files..."
+echo "Generating project files..."
 cd build
 
 @REM Note that we pass the CMAKE_BUILD_TYPE here only to enable the correct
@@ -20,10 +20,15 @@ cd build
 if /I "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
     set "VCPKG_TRIPLET=arm64-windows-static-md"
     set "CMAKE_ARCH=ARM64"
+    set "QT_ARCH_DIR=msvc2022_arm64"
 ) else (
     set "VCPKG_TRIPLET=x64-windows-static-md"
     set "CMAKE_ARCH=x64"
+    set "QT_ARCH_DIR=msvc2022_64"
 )
+
+if "%QT_INSTALL_LOCATION%"=="" call :detect_qt
+
 set "VCPKG_ROOT=%SCRIPT_DIR%vcpkg"
 set "VCPKG_TOOLCHAIN=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"
 set "VCPKG_FORCE_SYSTEM_BINARIES=1"
@@ -41,3 +46,23 @@ if %ERRORLEVEL% neq 0 (
 )
 
 cd %WORKING_DIR%
+exit /b 0
+
+:detect_qt
+for /f "delims=" %%V in ('dir /b /ad "C:\Qt" 2^>nul') do call :try_qt_version "%%V"
+if not defined QT_INSTALL_LOCATION goto :detect_qt_missing
+echo Auto-detected Qt at %QT_INSTALL_LOCATION%
+exit /b 0
+
+:detect_qt_missing
+echo WARNING: QT_INSTALL_LOCATION not set and no Qt6 found under C:\Qt
+echo          CMake configure will fail at find_package(Qt6).
+exit /b 0
+
+:try_qt_version
+echo %~1 | findstr /r "^6\." >nul
+if errorlevel 1 exit /b 0
+if exist "C:\Qt\%~1\%QT_ARCH_DIR%\lib\cmake\Qt6\Qt6Config.cmake" (
+    set "QT_INSTALL_LOCATION=C:\Qt\%~1\%QT_ARCH_DIR%"
+)
+exit /b 0

app/win-pre-vcpkg.bat

@@ -17,7 +17,7 @@ set VCPKG_FORCE_SYSTEM_BINARIES=
 if not exist "vcpkg\vcpkg.exe" (
     cd vcpkg
     echo Building vcpkg
-    call bootstrap-vcpkg.bat -disableMetrics
+    call .\bootstrap-vcpkg.bat -disableMetrics
     cd %~dp0
 )
 
@@ -29,7 +29,12 @@ if /I "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
 
 cd vcpkg
 @echo Installing Libraries (%VCPKG_TRIPLET%)
-vcpkg install libsndfile[core,external-libs] --triplet %VCPKG_TRIPLET% --recurse
+.\vcpkg install libsndfile[core,external-libs] --triplet %VCPKG_TRIPLET% --recurse
+if errorlevel 1 (
+    @echo vcpkg install failed with errorlevel %errorlevel%
+    cd %WORKING_DIR%
+    exit /b %errorlevel%
+)
 
 REM Diagnostic: list what libsndfile actually installed under share/.
 REM If find_package(SndFile) fails downstream, this output makes it

app/win-prebuild.bat

@@ -33,7 +33,7 @@ where cmake.exe
 echo Fetching submodules (app/external/supersonic)...
 git -C .. submodule update --init --recursive
 
-call win-pre-vcpkg.bat
-call win-pre-translations.bat
+call "%~dp0win-pre-vcpkg.bat"
+call "%~dp0win-pre-translations.bat"
 
 cd %WORKING_DIR%