diff options
Diffstat (limited to 'tools/build_scripts')
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 5 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadStable.bat | 4 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadTrunk.bat | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 37209cb88b..faccd85f65 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -33,7 +33,10 @@ if "%comp%"=="bin15" ( )
MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary
+if errorlevel 1 exit
+
MsBuild.exe "mir_icons.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary
+if errorlevel 1 exit
call pascal.bat %tp%
@@ -106,7 +109,7 @@ copy /V /Y ..\..\docs\mirandaboot.ini copy /V /Y %SourceDir%\tools\build_scripts\redist\x%tp%\bass\*.dll "Plugins\BASS"
popd
-exit
+goto :eof
rem the subroutine itself starts here
:checksum
diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index 9e911f7504..369d523a7b 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -30,9 +30,9 @@ popd echo Building v%MirVer% > version.txt -start /min /wait z1_ReBuild_Full.bat 32 %comp% +call z1_ReBuild_Full.bat 32 %comp% -start /min /wait z1_ReBuild_Full.bat 64 %comp% +call z1_ReBuild_Full.bat 64 %comp% call z2_PackPluginUpdater.bat 32 DEV_STABLE %comp% diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat index 5654149629..d268ae14dc 100644 --- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat +++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat @@ -7,9 +7,9 @@ if not %GIT_STATUS%==0 goto :Error xcopy /S /Y tools\build_scripts\*.* . >nul -start /min /wait z1_ReBuild_Full.bat 32 %comp% +call z1_ReBuild_Full.bat 32 %comp% -start /min /wait z1_ReBuild_Full.bat 64 %comp% +call z1_ReBuild_Full.bat 64 %comp% call z2_PackPluginUpdater.bat 32 DEV_N_STABLE %comp% |