From fe590e585a4dcd94dd1660c8609388af1fc43867 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 29 May 2008 23:55:32 +0000 Subject: [PATCH] 2008-05-30 01:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/make_b32_all.bat * contrib/make_vc_all.bat * contrib/hbmysql/make_b32.bat * contrib/hbmysql/make_vc.bat * contrib/hbfbird/make_b32.bat * contrib/hbfbird/make_vc.bat * contrib/hbapollo/make_b32.bat * contrib/hbapollo/make_vc.bat * contrib/hbhpdf/make_b32.bat * contrib/hbhpdf/make_vc.bat * contrib/hbpgsql/make_b32.bat * contrib/hbpgsql/make_vc.bat * contrib/rddads/make_b32.bat * contrib/rddads/make_vc.bat * contrib/hbfimage/make_b32.bat * contrib/hbfimage/make_vc.bat * contrib/hbgd/make_b32.bat * contrib/hbgd/make_vc.bat * Some internal envvars are now cleared on exit. * Some internal var names standardized (-> _HB_*). --- harbour/ChangeLog | 22 +++++++++++++++++++++ harbour/contrib/hbapollo/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbapollo/make_vc.bat | 26 +++++++++++++------------ harbour/contrib/hbfbird/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbfbird/make_vc.bat | 22 +++++++++++---------- harbour/contrib/hbfimage/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbfimage/make_vc.bat | 22 +++++++++++---------- harbour/contrib/hbgd/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbgd/make_vc.bat | 22 +++++++++++---------- harbour/contrib/hbhpdf/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbhpdf/make_vc.bat | 22 +++++++++++---------- harbour/contrib/hbmysql/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbmysql/make_vc.bat | 22 +++++++++++---------- harbour/contrib/hbpgsql/make_b32.bat | 22 +++++++++++---------- harbour/contrib/hbpgsql/make_vc.bat | 26 +++++++++++++------------ harbour/contrib/make_b32_all.bat | 28 +++++++++++++-------------- harbour/contrib/make_vc_all.bat | 28 +++++++++++++-------------- harbour/contrib/rddads/make_b32.bat | 28 ++++++++++++++------------- harbour/contrib/rddads/make_vc.bat | 28 ++++++++++++++------------- 19 files changed, 252 insertions(+), 198 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 51abe2cea8..95175795c4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,28 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-30 01:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat + * contrib/hbmysql/make_b32.bat + * contrib/hbmysql/make_vc.bat + * contrib/hbfbird/make_b32.bat + * contrib/hbfbird/make_vc.bat + * contrib/hbapollo/make_b32.bat + * contrib/hbapollo/make_vc.bat + * contrib/hbhpdf/make_b32.bat + * contrib/hbhpdf/make_vc.bat + * contrib/hbpgsql/make_b32.bat + * contrib/hbpgsql/make_vc.bat + * contrib/rddads/make_b32.bat + * contrib/rddads/make_vc.bat + * contrib/hbfimage/make_b32.bat + * contrib/hbfimage/make_vc.bat + * contrib/hbgd/make_b32.bat + * contrib/hbgd/make_vc.bat + * Some internal envvars are now cleared on exit. + * Some internal var names standardized (-> _HB_*). + 2008-05-30 01:36 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbct/files.c ! fixed memory leak in FILEDELETE() reported by Ed - thanks. diff --git a/harbour/contrib/hbapollo/make_b32.bat b/harbour/contrib/hbapollo/make_b32.bat index c2d098ea38..5470a90645 100644 --- a/harbour/contrib/hbapollo/make_b32.bat +++ b/harbour/contrib/hbapollo/make_b32.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_APOLLO%" == "" set HB_INC_APOLLO=%HB_DIR_APOLLO%\include set CFLAGS=-I"%HB_INC_APOLLO%" -set HB_DLL_NAME=sde61 -set HB_DLL_DIR=%HB_DIR_APOLLO% +set _HB_DLL_NAME=sde61 +set _HB_DLL_DIR=%HB_DIR_APOLLO% rem --------------------------------------------------------------- @@ -39,24 +39,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbapollo/make_vc.bat b/harbour/contrib/hbapollo/make_vc.bat index 3b189a6b72..6858efd2cf 100644 --- a/harbour/contrib/hbapollo/make_vc.bat +++ b/harbour/contrib/hbapollo/make_vc.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_APOLLO%" == "" set HB_INC_APOLLO=%HB_DIR_APOLLO%\include set CFLAGS=-I"%HB_INC_APOLLO%" -set HB_DLL_NAME=sde61 -set HB_DLL_DIR=%HB_DIR_APOLLO% +set _HB_DLL_NAME=sde61 +set _HB_DLL_DIR=%HB_DIR_APOLLO% rem --------------------------------------------------------------- @@ -47,11 +47,11 @@ if "%1" == "INSTALL" goto POST_INSTALL echo. s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed echo. }>> _temp.sed echo.}>> _temp.sed - DUMPBIN /EXPORTS "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _dump.tmp - echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _temp.def + DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _dump.tmp + echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed @@ -60,19 +60,21 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbfbird/make_b32.bat b/harbour/contrib/hbfbird/make_b32.bat index ffec4a960d..bf51a3134f 100644 --- a/harbour/contrib/hbfbird/make_b32.bat +++ b/harbour/contrib/hbfbird/make_b32.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_FIREBIRD%" == "" set HB_INC_FIREBIRD=%HB_DIR_FIREBIRD%\include set CFLAGS=-I"%HB_INC_FIREBIRD%" -set HB_DLL_NAME=fbclient -set HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin +set _HB_DLL_NAME=fbclient +set _HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_FIREBIRD%\%HB_DLL_NAME%_bor.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_FIREBIRD%\%_HB_DLL_NAME%_bor.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbfbird/make_vc.bat b/harbour/contrib/hbfbird/make_vc.bat index abb1200b5e..ae6eb7954d 100644 --- a/harbour/contrib/hbfbird/make_vc.bat +++ b/harbour/contrib/hbfbird/make_vc.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_FIREBIRD%" == "" set HB_INC_FIREBIRD=%HB_DIR_FIREBIRD%\include set CFLAGS=-I"%HB_INC_FIREBIRD%" -set HB_DLL_NAME=fbclient -set HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin +set _HB_DLL_NAME=fbclient +set _HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_FIREBIRD%\%HB_DLL_NAME%_ms.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_FIREBIRD%\%_HB_DLL_NAME%_ms.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbfimage/make_b32.bat b/harbour/contrib/hbfimage/make_b32.bat index 4dba6b9a18..b8d0f68b18 100644 --- a/harbour/contrib/hbfimage/make_b32.bat +++ b/harbour/contrib/hbfimage/make_b32.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_FREEIMAGE%" == "" set HB_INC_FREEIMAGE=%HB_DIR_FREEIMAGE%\source set CFLAGS=-I"%HB_INC_FREEIMAGE%" -set HB_DLL_NAME=FreeImage -set HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist +set _HB_DLL_NAME=FreeImage +set _HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbfimage/make_vc.bat b/harbour/contrib/hbfimage/make_vc.bat index 12ebf5830c..5a96b222f5 100644 --- a/harbour/contrib/hbfimage/make_vc.bat +++ b/harbour/contrib/hbfimage/make_vc.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_FREEIMAGE%" == "" set HB_INC_FREEIMAGE=%HB_DIR_FREEIMAGE%\source set CFLAGS=-I"%HB_INC_FREEIMAGE%" -set HB_DLL_NAME=FreeImage -set HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist +set _HB_DLL_NAME=FreeImage +set _HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist rem --------------------------------------------------------------- @@ -41,24 +41,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DLL_DIR%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbgd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat index d682624c7d..65149a5a3b 100644 --- a/harbour/contrib/hbgd/make_b32.bat +++ b/harbour/contrib/hbgd/make_b32.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_GD%" == "" set HB_INC_GD=%HB_DIR_GD%\include set CFLAGS=-I"%HB_INC_GD%" -set HB_DLL_NAME=bgd -set HB_DLL_DIR=%HB_DIR_GD%\bin +set _HB_DLL_NAME=bgd +set _HB_DLL_DIR=%HB_DIR_GD%\bin rem --------------------------------------------------------------- @@ -39,24 +39,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbgd/make_vc.bat b/harbour/contrib/hbgd/make_vc.bat index e9fb41b2e2..eb502cb72c 100644 --- a/harbour/contrib/hbgd/make_vc.bat +++ b/harbour/contrib/hbgd/make_vc.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_GD%" == "" set HB_INC_GD=%HB_DIR_GD%\include set CFLAGS=-I"%HB_INC_GD%" -set HB_DLL_NAME=bgd -set HB_DLL_DIR=%HB_DIR_GD%\bin +set _HB_DLL_NAME=bgd +set _HB_DLL_DIR=%HB_DIR_GD%\bin rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_GD%\lib\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_GD%\lib\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbhpdf/make_b32.bat b/harbour/contrib/hbhpdf/make_b32.bat index 8831c75963..074d904df2 100644 --- a/harbour/contrib/hbhpdf/make_b32.bat +++ b/harbour/contrib/hbhpdf/make_b32.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include set CFLAGS=-I"%HB_INC_LIBHARU%" -set HB_DLL_NAME=libhpdf -set HB_DLL_DIR=%HB_DIR_LIBHARU% +set _HB_DLL_NAME=libhpdf +set _HB_DLL_DIR=%HB_DIR_LIBHARU% rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbhpdf/make_vc.bat b/harbour/contrib/hbhpdf/make_vc.bat index 579a334c72..54ece64403 100644 --- a/harbour/contrib/hbhpdf/make_vc.bat +++ b/harbour/contrib/hbhpdf/make_vc.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include set CFLAGS=-I"%HB_INC_LIBHARU%" -set HB_DLL_NAME=libhpdf -set HB_DLL_DIR=%HB_DIR_LIBHARU% +set _HB_DLL_NAME=libhpdf +set _HB_DLL_DIR=%HB_DIR_LIBHARU% rem --------------------------------------------------------------- @@ -41,24 +41,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_LIBHARU%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbmysql/make_b32.bat b/harbour/contrib/hbmysql/make_b32.bat index f4089888fb..252364c751 100644 --- a/harbour/contrib/hbmysql/make_b32.bat +++ b/harbour/contrib/hbmysql/make_b32.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_MYSQL%" == "" set HB_INC_MYSQL=%HB_DIR_MYSQL%\include set CFLAGS=-I"%HB_INC_MYSQL%" -set HB_DLL_NAME=libmySQL -set HB_DLL_DIR=%HB_DIR_MYSQL%\bin +set _HB_DLL_NAME=libmySQL +set _HB_DLL_DIR=%HB_DIR_MYSQL%\bin rem --------------------------------------------------------------- @@ -39,24 +39,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbmysql/make_vc.bat b/harbour/contrib/hbmysql/make_vc.bat index 9fdda4bd6b..be3c58cb66 100644 --- a/harbour/contrib/hbmysql/make_vc.bat +++ b/harbour/contrib/hbmysql/make_vc.bat @@ -16,8 +16,8 @@ goto POST_EXIT if "%HB_INC_MYSQL%" == "" set HB_INC_MYSQL=%HB_DIR_MYSQL%\include set CFLAGS=-I"%HB_INC_MYSQL%" -D__WIN32__ -set HB_DLL_NAME=libmySQL -set HB_DLL_DIR=%HB_DIR_MYSQL%\bin +set _HB_DLL_NAME=libmySQL +set _HB_DLL_DIR=%HB_DIR_MYSQL%\bin rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_MYSQL%\lib\opt\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_MYSQL%\lib\opt\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbpgsql/make_b32.bat b/harbour/contrib/hbpgsql/make_b32.bat index 85e7e0665b..8d818a4db9 100644 --- a/harbour/contrib/hbpgsql/make_b32.bat +++ b/harbour/contrib/hbpgsql/make_b32.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include set CFLAGS=-I"%HB_INC_PGSQL%" rem .exe -set HB_DLL_NAME=postgres -set HB_DLL_DIR=%HB_DIR_PGSQL%\bin +set _HB_DLL_NAME=postgres +set _HB_DLL_DIR=%HB_DIR_PGSQL%\bin rem --------------------------------------------------------------- @@ -40,24 +40,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/hbpgsql/make_vc.bat b/harbour/contrib/hbpgsql/make_vc.bat index a1b532f193..7147eff680 100644 --- a/harbour/contrib/hbpgsql/make_vc.bat +++ b/harbour/contrib/hbpgsql/make_vc.bat @@ -17,8 +17,8 @@ goto POST_EXIT if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include set CFLAGS=-I"%HB_INC_PGSQL%" rem .exe -set HB_DLL_NAME=postgres -set HB_DLL_DIR=%HB_DIR_PGSQL%\bin +set _HB_DLL_NAME=postgres +set _HB_DLL_DIR=%HB_DIR_PGSQL%\bin rem --------------------------------------------------------------- @@ -48,11 +48,11 @@ if "%1" == "INSTALL" goto POST_INSTALL echo. s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed echo. }>> _temp.sed echo.}>> _temp.sed - DUMPBIN /EXPORTS "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" > _dump.tmp - echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" > _temp.def + DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" > _dump.tmp + echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed @@ -61,19 +61,21 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 0e30d2a817..522b00e3a1 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -24,26 +24,26 @@ rem ******************************************************* rem Creating a worker bat file ... rem ******************************************************* -set __BATWORKER__=_hbwrk_.bat +set _HB_BATWORKER=_hbwrk_.bat -echo @echo off >%__BATWORKER__% -echo if %%1x == x goto EXIT >>%__BATWORKER__% -echo if not exist %%1\make_b32.bat goto EXIT >>%__BATWORKER__% -echo echo Entering: %%1 >>%__BATWORKER__% -echo cd %%1 >>%__BATWORKER__% -echo call make_b32.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__% -echo cd .. >>%__BATWORKER__% -echo :EXIT >>%__BATWORKER__% +echo @echo off >%_HB_BATWORKER% +echo if %%1x == x goto EXIT >>%_HB_BATWORKER% +echo if not exist %%1\make_b32.bat goto EXIT >>%_HB_BATWORKER% +echo echo Entering: %%1 >>%_HB_BATWORKER% +echo cd %%1 >>%_HB_BATWORKER% +echo call make_b32.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%_HB_BATWORKER% +echo cd .. >>%_HB_BATWORKER% +echo :EXIT >>%_HB_BATWORKER% rem ******************************************************* rem Compiling contrib dirs ... rem ******************************************************* set _HB_DIRS=rddado hbbmcdx hbbtree gtwvg hbct hbgt hbmisc hbnf hbmsql hbmzip -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbvpdf hbw32 hbwhat32 xhb -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbclipsm hbw32ddr if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo @@ -54,14 +54,14 @@ if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 rem ******************************************************* rem Cleaning ... rem ******************************************************* -del %__BATWORKER__% > nul +del %_HB_BATWORKER% > nul set _HB_DIRS= -set __BATWORKER__= +set _HB_BATWORKER= set HB_SHOW_ERRORS= diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 3bf7f91795..f4bcbf6134 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -24,26 +24,26 @@ rem ******************************************************* rem Creating a worker bat file ... rem ******************************************************* -set __BATWORKER__=_hbwrk_.bat +set _HB_BATWORKER=_hbwrk_.bat -echo @echo off >%__BATWORKER__% -echo if %%1x == x goto EXIT >>%__BATWORKER__% -echo if not exist %%1\make_vc.bat goto EXIT >>%__BATWORKER__% -echo echo Entering: %%1 >>%__BATWORKER__% -echo cd %%1 >>%__BATWORKER__% -echo call make_vc.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%__BATWORKER__% -echo cd .. >>%__BATWORKER__% -echo :EXIT >>%__BATWORKER__% +echo @echo off >%_HB_BATWORKER% +echo if %%1x == x goto EXIT >>%_HB_BATWORKER% +echo if not exist %%1\make_vc.bat goto EXIT >>%_HB_BATWORKER% +echo echo Entering: %%1 >>%_HB_BATWORKER% +echo cd %%1 >>%_HB_BATWORKER% +echo call make_vc.bat %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >>%_HB_BATWORKER% +echo cd .. >>%_HB_BATWORKER% +echo :EXIT >>%_HB_BATWORKER% rem ******************************************************* rem Compiling contrib dirs ... rem ******************************************************* set _HB_DIRS=rddado hbbmcdx hbbtree gtwvg hbct hbgt hbmisc hbnf hbmsql hbmzip -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbvpdf hbw32 hbwhat32 xhb -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbclipsm hbw32ddr if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo @@ -54,14 +54,14 @@ if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf -for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 rem ******************************************************* rem Cleaning ... rem ******************************************************* -del %__BATWORKER__% > nul +del %_HB_BATWORKER% > nul set _HB_DIRS= -set __BATWORKER__= +set _HB_BATWORKER= set HB_SHOW_ERRORS= diff --git a/harbour/contrib/rddads/make_b32.bat b/harbour/contrib/rddads/make_b32.bat index 416fa84921..52f38b1023 100644 --- a/harbour/contrib/rddads/make_b32.bat +++ b/harbour/contrib/rddads/make_b32.bat @@ -16,12 +16,12 @@ goto POST_EXIT if "%HB_INC_ADS%" == "" set HB_INC_ADS=%HB_DIR_ADS% set CFLAGS=-I"%HB_INC_ADS%" -set HB_DLL_NAME=ace32 -if exist "%HB_DIR_ADS%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\Redistribute -if exist "%HB_DIR_ADS%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS% -if exist "%HB_DIR_ADS%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\32bit +set _HB_DLL_NAME=ace32 +if exist "%HB_DIR_ADS%\Redistribute\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS%\Redistribute +if exist "%HB_DIR_ADS%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS% +if exist "%HB_DIR_ADS%\32bit\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS%\32bit -echo Using this .dll: "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" +echo Using this .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" rem --------------------------------------------------------------- @@ -43,24 +43,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% + implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL= diff --git a/harbour/contrib/rddads/make_vc.bat b/harbour/contrib/rddads/make_vc.bat index 4435e5258f..7fe8ae92e2 100644 --- a/harbour/contrib/rddads/make_vc.bat +++ b/harbour/contrib/rddads/make_vc.bat @@ -16,12 +16,12 @@ goto POST_EXIT if "%HB_INC_ADS%" == "" set HB_INC_ADS=%HB_DIR_ADS% set CFLAGS=-I"%HB_INC_ADS%" -set HB_DLL_NAME=ace32 -if exist "%HB_DIR_ADS%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\Redistribute -if exist "%HB_DIR_ADS%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS% -if exist "%HB_DIR_ADS%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\32bit +set _HB_DLL_NAME=ace32 +if exist "%HB_DIR_ADS%\Redistribute\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS%\Redistribute +if exist "%HB_DIR_ADS%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS% +if exist "%HB_DIR_ADS%\32bit\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_ADS%\32bit -echo Using this .dll: "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" +echo Using this .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" rem --------------------------------------------------------------- @@ -44,24 +44,26 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD rem Use supplied .lib file. - if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%HB_DIR_ADS%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_ADS%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_INSTALL - if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib - if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT :POST_EXIT set CFLAGS= -set HB_DLL_NAME= -set HB_DLL_DIR= +set _HB_DLL_NAME= +set _HB_DLL_DIR= +set _HB_INSTALL_PREFIX= +set _HB_LIB_INSTALL=