2007-11-29 22:10 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

* harbour/make_b32.bat
  * harbour/make_vc.bat
  * harbour/make_vcce.bat
    * Added handling of exit level in case of make error
This commit is contained in:
Marek Paliwoda
2007-11-29 21:08:41 +00:00
parent 4ecdcce734
commit 226734c886
4 changed files with 33 additions and 6 deletions

View File

@@ -8,6 +8,12 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-29 22:10 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/make_b32.bat
* harbour/make_vc.bat
* harbour/make_vcce.bat
* Added handling of exit level in case of make error
2007-11-29 21:40 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/make_b32.bat
* harbour/make_vc.bat

View File

@@ -35,6 +35,8 @@ if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes
set HB_MAKEFILE=make_%HB_CC_NAME%.mak
set HB_EXIT_LEVEL=
rem ---------------------------------------------------------------
rem Save the user value, force silent file overwrite with COPY
@@ -54,12 +56,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
goto EXIT
:CLEAN
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
@@ -68,12 +72,13 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT
:EXIT
rem ---------------------------------------------------------------
:EXIT
rem Restore user value
set COPYCMD=%HB_ORGENV_COPYCMD%
@@ -88,3 +93,5 @@ set HB_GT_LIB_SAV=
set HB_CC_NAME_SAV=
set HB_MAKE_PROGRAM_SAV=
set HB_SHOW_ERRORS_SAV=
if "%HB_EXIT_LEVEL%" == "1" exit 1

View File

@@ -35,6 +35,8 @@ if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes
set HB_MAKEFILE=make_%HB_CC_NAME%.mak
set HB_EXIT_LEVEL=
rem ---------------------------------------------------------------
rem Save the user value, force silent file overwrite with COPY
@@ -54,12 +56,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
goto EXIT
:CLEAN
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
@@ -68,12 +72,13 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT
:EXIT
rem ---------------------------------------------------------------
:EXIT
rem Restore user value
set COPYCMD=%HB_ORGENV_COPYCMD%
@@ -88,3 +93,5 @@ set HB_GT_LIB_SAV=
set HB_CC_NAME_SAV=
set HB_MAKE_PROGRAM_SAV=
set HB_SHOW_ERRORS_SAV=
if "%HB_EXIT_LEVEL%" == "1" exit 1

View File

@@ -40,6 +40,8 @@ set HB_MAKEFILE=make_%HB_CC_NAME%.mak
set CFLAGS=%C_USR% -DHB_NO_WIN_CONSOLE
set HB_EXIT_LEVEL=
rem ---------------------------------------------------------------
rem Save the user value, force silent file overwrite with COPY
@@ -59,12 +61,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
goto EXIT
:CLEAN
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
@@ -73,12 +77,13 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT
:EXIT
rem ---------------------------------------------------------------
:EXIT
rem Restore user value
set COPYCMD=%HB_ORGENV_COPYCMD%
@@ -97,3 +102,5 @@ set HB_MAKE_PROGRAM_SAV=
set HB_SHOW_ERRORS_SAV=
set HB_GT_DEFAULT_SAV=
set C_USR_SAV=
if "%HB_EXIT_LEVEL%" == "1" exit 1