Changeset 55e44d4 in nscp for release-build.bat

Timestamp:

10/04/09 23:40:03 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

2e8b33f

Parents:

1fc246c

Message:

Added new command: assert which causes program to assert (and "crash") which I will use to test the debug builds.
Also reworked the build scripts to work better and such

File:

• release-build.bat (modified) (2 diffs)

release-build.bat

@@ -1 +1 @@
 @echo off
-
 @call env.bat
 
-SET version=crypto_hdr
-SET cmdline=%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
+SET _ERROR=
+echo Starting build > build.log
+
+echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
 %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
 if %ERRORLEVEL% == -1 goto :error
+echo :: Result: %ERRORLEVEL% >> build.log
 
-REM build x86 binary
-SET version=x86
-SET cmdline=build.bat runtime-link=static variant=release address-model=32 --library-path="%TARGET_LIB_x86_DIR%" --with-psdk-lib=%"PLATTFORM_SDK_LIB_x86%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
-call build.bat runtime-link=static variant=release address-model=32 --library-path="%TARGET_LIB_x86_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x86%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
+echo %jam% --toolset=msvc source-archive >> build.log
+%jam% --toolset=msvc source-archive
 if %ERRORLEVEL% == -1 goto :error
+echo :: Result: %ERRORLEVEL% >> build.log
 
-REM build x64 (Amd64, Emt64) binary
- SET version=x64
- SET cmdline=build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
- call build.bat runtime-link=static variant=release address-model=64 --library-path="%TARGET_LIB_x64_DIR%" --with-psdk-lib="%PLATTFORM_SDK_LIB_x64%" --with-psdk="%PLATTFORM_SDK_INCLUDE%" --wix="%WIX_PATH%"
- if %ERRORLEVEL% == -1 goto :error
-
-
-REM TODO: Add IA64 version
-rem version=IA64
+call :build_one variant=debug address-model=32 "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%"
+IF DEFINED _ERROR goto :error
+call :build_one variant=release address-model=32 "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%"
+IF DEFINED _ERROR goto :error
+call :build_one variant=debug address-model=64 "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%"
+IF DEFINED _ERROR goto :error
+call :build_one variant=release address-model=64 "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%"
+IF DEFINED _ERROR goto :error
 rem call build.bat runtime-link=static variant=release architecture=ia64 --library-path=%TARGET_LIB_IA64_DIR%
-rem if %ERRORLEVEL% == -1 goto :error
 
 echo *************
@@ -31 +30 @@
 echo *           *
 echo *************
-
 goto :eof
 
-:error
+:build_one
+echo build.bat runtime-link=static %* >> build.log
+call build.bat runtime-link=static %*
+if %ERRORLEVEL% == -1 goto :error_one
+echo Result: %ERRORLEVEL% >> build.log
+goto :eof
+
+:error_one
 echo *********************
 echo *                   *
 echo *    E R R O R      *
 echo *                   *
-echo * When building %version% *
+echo *********************
+set _ERROR=1
+exit /b -1
+goto :eof
+
+:error
+echo :: Error: %ERRORLEVEL% >> build.log
+echo *********************
+echo *                   *
+echo *    E R R O R      *
 echo *                   *
 echo *********************
-echo %cmdline%
+type build.log