batch files enhancement - it shall stop if one of plugins fails to compile

git-svn-id: http://svn.miranda-ng.org/main/trunk@3819 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 43 insertions, 3 deletions

diff --git a/bin11/pascal32.bat b/bin11/pascal32.bat
index f765872b32..45a11e982a 100644
--- a/bin11/pascal32.bat
+++ b/bin11/pascal32.bat
@@ -1,35 +1,48 @@
-rem @echo off

+@echo off

 

 pushd ..\plugins

 

 pushd Actman

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd ImportTXT

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd mRadio

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd QuickSearch

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd ShlExt

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd Watrack

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 cd icons

 call makeicons.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

 pushd Dbx_mmap_SA\Cryptors\Athena

 call make.bat fpc 11

+if errorlevel 1 goto :Error

 popd

 

-popd
\ No newline at end of file
+popd

+goto :eof

+

+:Error

+echo ============================= FAIL! =============================

+exit

diff --git a/bin11/pascal64.bat b/bin11/pascal64.bat
index 75446fdbd9..eefa9dc699 100644
--- a/bin11/pascal64.bat
+++ b/bin11/pascal64.bat
@@ -4,28 +4,40 @@ pushd ..\plugins
 

 pushd Actman

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

 pushd mRadio

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

 pushd QuickSearch

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

 pushd ShlExt

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

 pushd Watrack

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 cd icons

 call makeicons.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

 pushd Dbx_mmap_SA\Cryptors\Athena

 call make.bat fpc64 11

+if errorlevel 1 goto :Error

 popd

 

-popd
\ No newline at end of file
+popd

+goto :eof

+

+:Error

+echo ============================= FAIL! =============================

+exit

diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat
index ad79d9a55a..e8f2a0a233 100644
--- a/plugins/Actman/make.bat
+++ b/plugins/Actman/make.bat
@@ -21,8 +21,10 @@ rem brcc32.exe %myopts% tasks\tasks.rc -fotasks\tasks.res
 rem brcc32.exe %myopts% ua\ua.rc       -foua\ua.res

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
index 53e82cc006..822532a3d9 100644
--- a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
+++ b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
@@ -18,8 +18,10 @@ md tmp
 rem brcc32.exe %myopts% athena.rc     -fooathena.res

 

 %FPCBIN% @..\..\..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/ImportTXT/make.bat b/plugins/ImportTXT/make.bat
index df592dc9ce..027a6731b9 100644
--- a/plugins/ImportTXT/make.bat
+++ b/plugins/ImportTXT/make.bat
@@ -20,8 +20,10 @@ rem brcc32 -foImpTxtDlg.res ImpTxtDlg.rc
 rem brcc32 -foImpTxtWiz.res ImpTxtWiz.rc

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat
index 26085d5760..4aa4e3f70d 100644
--- a/plugins/QuickSearch/make.bat
+++ b/plugins/QuickSearch/make.bat
@@ -18,8 +18,10 @@ md tmp
 rem brcc32.exe qs.rc -foqs.res

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat
index 2604241425..f97c5ed9a3 100644
--- a/plugins/ShlExt/make.bat
+++ b/plugins/ShlExt/make.bat
@@ -16,8 +16,10 @@ if not exist %OUTDIR% mkdir %OUTDIR%
 md tmp

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/Watrack/icons/make.bat b/plugins/Watrack/icons/make.bat
index 95f90dcca6..b53e963672 100644
--- a/plugins/Watrack/icons/make.bat
+++ b/plugins/Watrack/icons/make.bat
@@ -14,3 +14,4 @@ if /i '%3' == '' (set asm=tasm) else set asm=%3
 cd %asm%

 call icons.bat %pack% ..\iconsets\%iconpack% %4 %5 %6 %7 %8 %9

 cd ..\

+exit /b 0

diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat
index 5fa64f556e..b0523071f9 100644
--- a/plugins/Watrack/make.bat
+++ b/plugins/Watrack/make.bat
@@ -27,8 +27,10 @@ rem brcc32.exe status\status.rc       -fostatus\status.res
 rem brcc32.exe templates\templates.rc -fotemplates\templates.res

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q .\tmp\*

 rd tmp

+exit /b 0

diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat
index da44c84de0..066c540fe9 100644
--- a/plugins/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
@@ -18,8 +18,10 @@ md tmp
 rem brcc32.exe mradio.rc -fomradio.res

 

 %FPCBIN% @..\..\plugins\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

+if errorlevel 1 exit /b 1

 

 move .\tmp\%PROJECT%.dll %OUTDIR%

 move .\tmp\%PROJECT%.map .

 del /Q tmp\*

 rd tmp

+exit /b 0