Updated build scripts to use CEcho program.

[lamexp/LameXP.git] / etc / Deployment / _build.bat

diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat
index 2344d19..f9f587d 100644 (file)
--- a/etc/Deployment/_build.bat
+++ b/etc/Deployment/_build.bat
@@ -1,24 +1,45 @@
 @echo off
-set "LAMEXP_ERROR=1"
+
+echo.
 echo ----------------------------------------------------------------
 echo Solution File: %1
 echo Configuration: %~2
 echo ----------------------------------------------------------------
-call _paths.bat
-if not "%LAMEXP_ERROR%"=="0" GOTO:EOF
-REM -----------------------------------------------------------------
-call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86
-call "%PATH_QTMSVC%\bin\qtvars.bat"
-REM -----------------------------------------------------------------
-set "LAMEXP_ERROR=1"
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean /verbosity:detailed %1
-if not "%ERRORLEVEL%"=="0" GOTO:EOF
-echo ----------------------------------------------------------------
-set "LAMEXP_ERROR=1"
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Rebuild /verbosity:detailed %1
+echo.
+
+:: ---------------------------------------------------------------------------
+:: SETUP PATHS
+:: ---------------------------------------------------------------------------
+
+call "%~dp0\_paths.bat"
+call "%PATH_MSCDIR%\VC\bin\vcvars32.bat" x86
+
+if exist "%PATH_QTMSVC%\bin\qtenv2.bat" (
+       call "%PATH_QTMSVC%\bin\qtenv2.bat"
+)
+
+if exist "%PATH_QTMSVC%\bin\qtvars.bat" (
+       call "%PATH_QTMSVC%\bin\qtvars.bat"
+)
+
+:: ---------------------------------------------------------------------------
+:: BUILD THE PROJECT
+:: ---------------------------------------------------------------------------
+
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Clean   /verbosity:normal "%~1"
 if not "%ERRORLEVEL%"=="0" (
-       msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Build /verbosity:detailed %1
-       if not "%ERRORLEVEL%"=="0" GOTO:EOF
+       "%~dp0\..\Utilities\CEcho.exe" red "\nBuild process has failed!\n"
+       pause && exit
+)
+
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Rebuild /verbosity:normal "%~1"
+if not "%ERRORLEVEL%"=="0" (
+       "%~dp0\..\Utilities\CEcho.exe" red "\nBuild process has failed!\n"
+       pause && exit
+)
+
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Build   /verbosity:normal "%~1"
+if not "%ERRORLEVEL%"=="0" (
+       "%~dp0\..\Utilities\CEcho.exe" red "\nBuild process has failed!\n"
+       pause && exit
 )
-echo ----------------------------------------------------------------
-set "LAMEXP_ERROR=0"