From f02145dc307de8b96f81f79ec3a56bbfdcdaa216 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 21 May 2008 11:45:42 +0000 Subject: [PATCH] 2008-05-21 15:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/bld.bat * bin/bld_os2.cmd ! Removed trailing backslash from default Harbour bin dirs. * contrib/hbapollo/make_b32.bat * contrib/hbapollo/make_vc.bat * contrib/hbfbird/make_b32.bat * contrib/hbfbird/make_vc.bat * contrib/hbfimage/make_b32.bat * contrib/hbfimage/make_vc.bat * contrib/hbgd/make_b32.bat * contrib/hbgd/make_vc.bat * contrib/hbhpdf/make_b32.bat * contrib/hbhpdf/make_vc.bat * contrib/hbmysql/make_b32.bat * contrib/hbmysql/make_vc.bat * contrib/hbodbc/make_b32.bat * contrib/hbodbc/make_vc.bat * contrib/hbpgsql/make_b32.bat * contrib/hbpgsql/make_vc.bat * contrib/hbw32ddr/make_b32.bat * contrib/hbw32ddr/make_vc.bat * contrib/hbzlib/make_b32.bat * contrib/hbzlib/make_vc.bat * contrib/rddads/make_b32.bat * contrib/rddads/make_vc.bat ! Fixed to handle long *_DIR settings in those contribs where external packages are required. * contrib/gtwvg/tests/bld_b32.bat * contrib/gtwvg/tests/bld_vc.bat * contrib/hbapollo/tests/bld_b32.bat * contrib/hbapollo/tests/bld_vc.bat * contrib/hbclipsm/tests/bld_b32.bat * contrib/hbclipsm/tests/bld_vc.bat * contrib/hbct/tests/bld_b32.bat * contrib/hbct/tests/bld_vc.bat * contrib/hbfbird/tests/bld_b32.bat * contrib/hbfbird/tests/bld_vc.bat * contrib/hbfimage/tests/bld_b32.bat * contrib/hbfimage/tests/bld_vc.bat * contrib/hbgd/tests/bld_b32.bat * contrib/hbgd/tests/bld_vc.bat * contrib/hbgf/tests/bld_b32.bat * contrib/hbgf/tests/bld_vc.bat * contrib/hbhpdf/tests/bld_b32.bat * contrib/hbhpdf/tests/bld_vc.bat * contrib/hbmisc/tests/bld_b32.bat * contrib/hbmisc/tests/bld_vc.bat * contrib/hbmysql/tests/bld_b32.bat * contrib/hbmysql/tests/bld_vc.bat * contrib/hbnf/tests/bld_b32.bat * contrib/hbnf/tests/bld_vc.bat * contrib/hbodbc/tests/bld_b32.bat * contrib/hbodbc/tests/bld_vc.bat * contrib/hbole/tests/bld_b32.bat * contrib/hbole/tests/bld_vc.bat * contrib/hbpgsql/tests/bld_b32.bat * contrib/hbpgsql/tests/bld_vc.bat * contrib/hbtpathy/tests/bld_b32.bat * contrib/hbtpathy/tests/bld_vc.bat * contrib/hbvpdf/tests/bld_b32.bat * contrib/hbvpdf/tests/bld_vc.bat * contrib/hbw32/tests/bld_b32.bat * contrib/hbw32/tests/bld_vc.bat * contrib/hbw32ddr/tests/bld_b32.bat * contrib/hbw32ddr/tests/bld_vc.bat * contrib/hbzlib/tests/bld_b32.bat * contrib/hbzlib/tests/bld_vc.bat * contrib/rddado/tests/bld_b32.bat * contrib/rddado/tests/bld_vc.bat * contrib/rddads/tests/bld_b32.bat * contrib/rddads/tests/bld_vc.bat ! Fixed to honor HB_*_INSTALL envvar settings in bld_*.bats for /tests * contrib/examples/hscript/dir.hs * contrib/examples/hscript/bld_b32.bat - contrib/examples/hscript/makehtm.bat * Cleanup. * contrib/rddads/rddads.h * contrib/rddads/adsfunc.c * contrib/rddads/ads1.c * contrib/rddads/adsmgmnt.c * Header cleanup, minor code opt. * ADS_REQUIRE_VERSION==8 is now equivalent to ADS_LIB_VERSION=810. Brian suggested this is what the majority of users need. See next however. * ADS_REQUIRE_VERSION compatibility handling disabled to make usage and support more straightforward. I'd suggest everyone to remove any old ADS_REQUIRE_VERSION settings, if - and only if - there is a need to force an older version, ADS_LIB_VERSION=??? should be used, where ??? is 810 for ACE 8.11 (for example). --- harbour/ChangeLog | 100 ++++++++++++++++++- harbour/bin/bld.bat | 6 +- harbour/bin/bld_os2.cmd | 6 +- harbour/contrib/examples/hscript/bld_b32.bat | 20 +++- harbour/contrib/examples/hscript/dir.hs | 8 +- harbour/contrib/examples/hscript/makehtm.bat | 37 ------- harbour/contrib/gtwvg/tests/bld_b32.bat | 14 +-- harbour/contrib/gtwvg/tests/bld_vc.bat | 14 +-- harbour/contrib/hbapollo/make_b32.bat | 4 +- harbour/contrib/hbapollo/make_vc.bat | 6 +- harbour/contrib/hbapollo/tests/bld_b32.bat | 14 +-- harbour/contrib/hbapollo/tests/bld_vc.bat | 14 +-- harbour/contrib/hbclipsm/tests/bld_b32.bat | 14 +-- harbour/contrib/hbclipsm/tests/bld_vc.bat | 14 +-- harbour/contrib/hbct/tests/bld_b32.bat | 14 +-- harbour/contrib/hbct/tests/bld_vc.bat | 14 +-- harbour/contrib/hbfbird/make_b32.bat | 4 +- harbour/contrib/hbfbird/make_vc.bat | 4 +- harbour/contrib/hbfbird/tests/bld_b32.bat | 14 +-- harbour/contrib/hbfbird/tests/bld_vc.bat | 14 +-- harbour/contrib/hbfimage/make_b32.bat | 4 +- harbour/contrib/hbfimage/make_vc.bat | 4 +- harbour/contrib/hbfimage/tests/bld_b32.bat | 14 +-- harbour/contrib/hbfimage/tests/bld_vc.bat | 14 +-- harbour/contrib/hbgd/make_b32.bat | 4 +- harbour/contrib/hbgd/make_vc.bat | 4 +- harbour/contrib/hbgd/tests/bld_b32.bat | 14 +-- harbour/contrib/hbgd/tests/bld_vc.bat | 14 +-- harbour/contrib/hbgf/tests/bld_b32.bat | 14 +-- harbour/contrib/hbgf/tests/bld_vc.bat | 14 +-- harbour/contrib/hbhpdf/make_b32.bat | 4 +- harbour/contrib/hbhpdf/make_vc.bat | 4 +- harbour/contrib/hbhpdf/tests/bld_b32.bat | 14 +-- harbour/contrib/hbhpdf/tests/bld_vc.bat | 14 +-- harbour/contrib/hbmisc/tests/bld_b32.bat | 14 +-- harbour/contrib/hbmisc/tests/bld_vc.bat | 14 +-- harbour/contrib/hbmysql/make_b32.bat | 4 +- harbour/contrib/hbmysql/make_vc.bat | 4 +- harbour/contrib/hbmysql/tests/bld_b32.bat | 14 +-- harbour/contrib/hbmysql/tests/bld_vc.bat | 14 +-- harbour/contrib/hbnf/tests/bld_b32.bat | 14 +-- harbour/contrib/hbnf/tests/bld_vc.bat | 14 +-- harbour/contrib/hbodbc/make_b32.bat | 2 +- harbour/contrib/hbodbc/make_vc.bat | 4 +- harbour/contrib/hbodbc/tests/bld_b32.bat | 14 +-- harbour/contrib/hbodbc/tests/bld_vc.bat | 14 +-- harbour/contrib/hbole/tests/bld_b32.bat | 14 +-- harbour/contrib/hbole/tests/bld_vc.bat | 14 +-- harbour/contrib/hbpgsql/make_b32.bat | 4 +- harbour/contrib/hbpgsql/make_vc.bat | 6 +- harbour/contrib/hbpgsql/tests/bld_b32.bat | 14 +-- harbour/contrib/hbpgsql/tests/bld_vc.bat | 14 +-- harbour/contrib/hbtpathy/tests/bld_b32.bat | 14 +-- harbour/contrib/hbtpathy/tests/bld_vc.bat | 14 +-- harbour/contrib/hbvpdf/tests/bld_b32.bat | 14 +-- harbour/contrib/hbvpdf/tests/bld_vc.bat | 10 +- harbour/contrib/hbw32/tests/bld_b32.bat | 14 +-- harbour/contrib/hbw32/tests/bld_vc.bat | 14 +-- harbour/contrib/hbw32ddr/make_b32.bat | 2 +- harbour/contrib/hbw32ddr/make_vc.bat | 4 +- harbour/contrib/hbw32ddr/tests/bld_b32.bat | 14 +-- harbour/contrib/hbw32ddr/tests/bld_vc.bat | 14 +-- harbour/contrib/hbzlib/make_b32.bat | 4 +- harbour/contrib/hbzlib/make_vc.bat | 4 +- harbour/contrib/hbzlib/tests/bld_b32.bat | 14 +-- harbour/contrib/hbzlib/tests/bld_vc.bat | 14 +-- harbour/contrib/rddado/tests/bld_b32.bat | 14 +-- harbour/contrib/rddado/tests/bld_vc.bat | 14 +-- harbour/contrib/rddads/ads1.c | 7 +- harbour/contrib/rddads/adsfunc.c | 30 +++--- harbour/contrib/rddads/adsmgmnt.c | 4 +- harbour/contrib/rddads/make_b32.bat | 6 +- harbour/contrib/rddads/make_vc.bat | 6 +- harbour/contrib/rddads/rddads.h | 4 +- harbour/contrib/rddads/tests/bld_b32.bat | 14 +-- harbour/contrib/rddads/tests/bld_vc.bat | 14 +-- 76 files changed, 327 insertions(+), 599 deletions(-) delete mode 100644 harbour/contrib/examples/hscript/makehtm.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 82ff2931da..54058c4e3f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,104 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-21 15:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/bld.bat + * bin/bld_os2.cmd + ! Removed trailing backslash from default Harbour bin dirs. + + * contrib/hbapollo/make_b32.bat + * contrib/hbapollo/make_vc.bat + * contrib/hbfbird/make_b32.bat + * contrib/hbfbird/make_vc.bat + * contrib/hbfimage/make_b32.bat + * contrib/hbfimage/make_vc.bat + * contrib/hbgd/make_b32.bat + * contrib/hbgd/make_vc.bat + * contrib/hbhpdf/make_b32.bat + * contrib/hbhpdf/make_vc.bat + * contrib/hbmysql/make_b32.bat + * contrib/hbmysql/make_vc.bat + * contrib/hbodbc/make_b32.bat + * contrib/hbodbc/make_vc.bat + * contrib/hbpgsql/make_b32.bat + * contrib/hbpgsql/make_vc.bat + * contrib/hbw32ddr/make_b32.bat + * contrib/hbw32ddr/make_vc.bat + * contrib/hbzlib/make_b32.bat + * contrib/hbzlib/make_vc.bat + * contrib/rddads/make_b32.bat + * contrib/rddads/make_vc.bat + ! Fixed to handle long *_DIR settings in those + contribs where external packages are required. + + * contrib/gtwvg/tests/bld_b32.bat + * contrib/gtwvg/tests/bld_vc.bat + * contrib/hbapollo/tests/bld_b32.bat + * contrib/hbapollo/tests/bld_vc.bat + * contrib/hbclipsm/tests/bld_b32.bat + * contrib/hbclipsm/tests/bld_vc.bat + * contrib/hbct/tests/bld_b32.bat + * contrib/hbct/tests/bld_vc.bat + * contrib/hbfbird/tests/bld_b32.bat + * contrib/hbfbird/tests/bld_vc.bat + * contrib/hbfimage/tests/bld_b32.bat + * contrib/hbfimage/tests/bld_vc.bat + * contrib/hbgd/tests/bld_b32.bat + * contrib/hbgd/tests/bld_vc.bat + * contrib/hbgf/tests/bld_b32.bat + * contrib/hbgf/tests/bld_vc.bat + * contrib/hbhpdf/tests/bld_b32.bat + * contrib/hbhpdf/tests/bld_vc.bat + * contrib/hbmisc/tests/bld_b32.bat + * contrib/hbmisc/tests/bld_vc.bat + * contrib/hbmysql/tests/bld_b32.bat + * contrib/hbmysql/tests/bld_vc.bat + * contrib/hbnf/tests/bld_b32.bat + * contrib/hbnf/tests/bld_vc.bat + * contrib/hbodbc/tests/bld_b32.bat + * contrib/hbodbc/tests/bld_vc.bat + * contrib/hbole/tests/bld_b32.bat + * contrib/hbole/tests/bld_vc.bat + * contrib/hbpgsql/tests/bld_b32.bat + * contrib/hbpgsql/tests/bld_vc.bat + * contrib/hbtpathy/tests/bld_b32.bat + * contrib/hbtpathy/tests/bld_vc.bat + * contrib/hbvpdf/tests/bld_b32.bat + * contrib/hbvpdf/tests/bld_vc.bat + * contrib/hbw32/tests/bld_b32.bat + * contrib/hbw32/tests/bld_vc.bat + * contrib/hbw32ddr/tests/bld_b32.bat + * contrib/hbw32ddr/tests/bld_vc.bat + * contrib/hbzlib/tests/bld_b32.bat + * contrib/hbzlib/tests/bld_vc.bat + * contrib/rddado/tests/bld_b32.bat + * contrib/rddado/tests/bld_vc.bat + * contrib/rddads/tests/bld_b32.bat + * contrib/rddads/tests/bld_vc.bat + ! Fixed to honor HB_*_INSTALL envvar settings in + bld_*.bats for /tests + + * contrib/examples/hscript/dir.hs + * contrib/examples/hscript/bld_b32.bat + - contrib/examples/hscript/makehtm.bat + * Cleanup. + + * contrib/rddads/rddads.h + * contrib/rddads/adsfunc.c + * contrib/rddads/ads1.c + * contrib/rddads/adsmgmnt.c + * Header cleanup, minor code opt. + * ADS_REQUIRE_VERSION==8 is now equivalent to + ADS_LIB_VERSION=810. Brian suggested this is what + the majority of users need. See next however. + * ADS_REQUIRE_VERSION compatibility handling + disabled to make usage and support more + straightforward. I'd suggest everyone to remove + any old ADS_REQUIRE_VERSION settings, if - and only + if - there is a need to force an older version, + ADS_LIB_VERSION=??? should be used, where ??? is + 810 for ACE 8.11 (for example). + 2008-05-21 11:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/tbrowse.prg * updated some comments @@ -304,7 +402,7 @@ ! Absolute paths changed to relative ones (for both input and output ones). ! NumToHex() -> hb_NumToHex() - + hbct added to liblist because test program + + hbct added to lib list because test program uses SIN()/COS()/TAN() from it. - contrib/hbhpdf/tests/harupdf.ch diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 4c6addb998..d126e3d950 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -24,9 +24,9 @@ rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=w32 rem if "%HB_COMPILER%" == "" set HB_COMPILER=mingw32 rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\ +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include :START diff --git a/harbour/bin/bld_os2.cmd b/harbour/bin/bld_os2.cmd index b64ce1e0d9..32985da96d 100644 --- a/harbour/bin/bld_os2.cmd +++ b/harbour/bin/bld_os2.cmd @@ -14,9 +14,9 @@ rem --------------------------------------------------------------- if "%HB_COMPILER%" == "" set HB_COMPILER=gcc -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin\ -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib\ -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\ +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include :START diff --git a/harbour/contrib/examples/hscript/bld_b32.bat b/harbour/contrib/examples/hscript/bld_b32.bat index b7ef855980..403e7dfac7 100644 --- a/harbour/contrib/examples/hscript/bld_b32.bat +++ b/harbour/contrib/examples/hscript/bld_b32.bat @@ -3,8 +3,26 @@ rem rem $Id$ rem -rem NOTE: This sample program need nf.lib from contrib/libnf +rem NOTE: This sample program needs hbnf.lib from contrib/hbnf ..\..\..\bin\harbour hscript /n /i..\..\..\include bcc32 -O2 -I..\..\..\include -L..\..\..\lib -ehscript.exe hscript.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbcpage.lib hbsix.lib hbcommon.lib hbpcre.lib hbhsx.lib hbnf.lib del hscript.c + +if not exist hscript.exe goto :EXIT + +hscript dir.hs > dir.htm +hscript hello.hs > hello.htm +hscript multiply.hs > multiply.htm +hscript ugly.hs > ugly.htm + +echo Ready to go! +echo. +echo Try: +echo. +echo start dir.htm +echo start hello.htm +echo start multiply.htm +echo start ugly.htm + +:EXIT diff --git a/harbour/contrib/examples/hscript/dir.hs b/harbour/contrib/examples/hscript/dir.hs index e55b27aaf8..1fca17e9d0 100644 --- a/harbour/contrib/examples/hscript/dir.hs +++ b/harbour/contrib/examples/hscript/dir.hs @@ -6,15 +6,15 @@ */ FUNCTION Start() - LOCAL aDir := directory( "c:\*.*" ) + LOCAL aDir := Directory( "*.*" ) LOCAL i - IF !empty( GetEnv( "SERVER_NAME" ) ) + IF !Empty( GetEnv( "SERVER_NAME" ) ) OutStd( "HTTP/1.0 200 OK" + chr(10) ) OutStd( "CONTENT-TYPE: TEXT/HTML" + chr(10) + chr(10) ) ENDIF - aSort( aDir,,, { |x, y| x[1] < y[1] } ) + ASort( aDir,,, { |x, y| x[1] < y[1] } ) %> dir.hs - HarourScript demo of active context @@ -29,7 +29,7 @@ FUNCTION Start() Attributes <% - FOR i := 1 TO len( aDir ) + FOR i := 1 TO Len( aDir ) %> <% OutStd( aDir[i,1] ) %> diff --git a/harbour/contrib/examples/hscript/makehtm.bat b/harbour/contrib/examples/hscript/makehtm.bat deleted file mode 100644 index 4cd2041c85..0000000000 --- a/harbour/contrib/examples/hscript/makehtm.bat +++ /dev/null @@ -1,37 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -IF NOT EXIST hscript.exe GOTO :missing - -:start -SET HARBOURDIR=.\ - -hscript hello.hs > hello.htm -hscript multiply.hs > multiply.htm -hscript dir.hs > dir.htm -hscript ugly.hs > ugly.htm - -cls -echo Ready to go! -echo\ -echo If you're under W95/98 try: -echo\ -echo start hello.htm -echo -or- -echo start multiply.htm -echo -or- -echo start dir.htm - -goto end - -:missing -echo Missing hscript.exe -echo\ -echo Press any key to build it or Ctrl+C to quit... -pause>nul -call makehs -goto :start - -:end diff --git a/harbour/contrib/gtwvg/tests/bld_b32.bat b/harbour/contrib/gtwvg/tests/bld_b32.bat index 20f8740e5d..f392846a14 100644 --- a/harbour/contrib/gtwvg/tests/bld_b32.bat +++ b/harbour/contrib/gtwvg/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/gtwvg/tests/bld_vc.bat b/harbour/contrib/gtwvg/tests/bld_vc.bat index 75c640f147..a66dd9c323 100644 --- a/harbour/contrib/gtwvg/tests/bld_vc.bat +++ b/harbour/contrib/gtwvg/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbapollo/make_b32.bat b/harbour/contrib/hbapollo/make_b32.bat index a61d211d73..da54caf701 100644 --- a/harbour/contrib/hbapollo/make_b32.bat +++ b/harbour/contrib/hbapollo/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%APOLLO_DIR%\include +set CFLAGS=-I"%APOLLO_DIR%\include" set HB_DLL_NAME=sde61 set HB_DLL_DIR=%APOLLO_DIR% @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbapollo/make_vc.bat b/harbour/contrib/hbapollo/make_vc.bat index 5bba97a383..9fdfaec657 100644 --- a/harbour/contrib/hbapollo/make_vc.bat +++ b/harbour/contrib/hbapollo/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%APOLLO_DIR%\include +set CFLAGS=-I"%APOLLO_DIR%\include" set HB_DLL_NAME=sde61 set HB_DLL_DIR=%APOLLO_DIR% @@ -46,8 +46,8 @@ 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 diff --git a/harbour/contrib/hbapollo/tests/bld_b32.bat b/harbour/contrib/hbapollo/tests/bld_b32.bat index 94b9c06c99..720381c9e3 100644 --- a/harbour/contrib/hbapollo/tests/bld_b32.bat +++ b/harbour/contrib/hbapollo/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbapollo/tests/bld_vc.bat b/harbour/contrib/hbapollo/tests/bld_vc.bat index deb065b832..a409ac85ca 100644 --- a/harbour/contrib/hbapollo/tests/bld_vc.bat +++ b/harbour/contrib/hbapollo/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbclipsm/tests/bld_b32.bat b/harbour/contrib/hbclipsm/tests/bld_b32.bat index 517df82125..93bf6548da 100644 --- a/harbour/contrib/hbclipsm/tests/bld_b32.bat +++ b/harbour/contrib/hbclipsm/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbclipsm/tests/bld_vc.bat b/harbour/contrib/hbclipsm/tests/bld_vc.bat index 965b8f76da..b90c58b03a 100644 --- a/harbour/contrib/hbclipsm/tests/bld_vc.bat +++ b/harbour/contrib/hbclipsm/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbct/tests/bld_b32.bat b/harbour/contrib/hbct/tests/bld_b32.bat index 3445135e1e..4266587812 100644 --- a/harbour/contrib/hbct/tests/bld_b32.bat +++ b/harbour/contrib/hbct/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbct/tests/bld_vc.bat b/harbour/contrib/hbct/tests/bld_vc.bat index 147e00edb3..c1e9c94f62 100644 --- a/harbour/contrib/hbct/tests/bld_vc.bat +++ b/harbour/contrib/hbct/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbfbird/make_b32.bat b/harbour/contrib/hbfbird/make_b32.bat index a595f5b9bb..1f8c89d235 100644 --- a/harbour/contrib/hbfbird/make_b32.bat +++ b/harbour/contrib/hbfbird/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%FIREBIRD_DIR%\include +set CFLAGS=-I"%FIREBIRD_DIR%\include" set HB_DLL_NAME=fbclient set HB_DLL_DIR=%FIREBIRD_DIR%\bin @@ -39,7 +39,7 @@ 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 %FIREBIRD_DIR%\%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 "%FIREBIRD_DIR%\%HB_DLL_NAME%_bor.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbfbird/make_vc.bat b/harbour/contrib/hbfbird/make_vc.bat index a9f2bad0e1..5be36e990d 100644 --- a/harbour/contrib/hbfbird/make_vc.bat +++ b/harbour/contrib/hbfbird/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%FIREBIRD_DIR%\include +set CFLAGS=-I"%FIREBIRD_DIR%\include" set HB_DLL_NAME=fbclient set HB_DLL_DIR=%FIREBIRD_DIR%\bin @@ -39,7 +39,7 @@ 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 %FIREBIRD_DIR%\%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 "%FIREBIRD_DIR%\%HB_DLL_NAME%_ms.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbfbird/tests/bld_b32.bat b/harbour/contrib/hbfbird/tests/bld_b32.bat index 2e7a53f072..4547868ee8 100644 --- a/harbour/contrib/hbfbird/tests/bld_b32.bat +++ b/harbour/contrib/hbfbird/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbfbird/tests/bld_vc.bat b/harbour/contrib/hbfbird/tests/bld_vc.bat index 79228157b3..af8801d315 100644 --- a/harbour/contrib/hbfbird/tests/bld_vc.bat +++ b/harbour/contrib/hbfbird/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbfimage/make_b32.bat b/harbour/contrib/hbfimage/make_b32.bat index 853d3548d0..2c67b9d090 100644 --- a/harbour/contrib/hbfimage/make_b32.bat +++ b/harbour/contrib/hbfimage/make_b32.bat @@ -15,7 +15,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%FREEIMAGE_DIR%\source +set CFLAGS=-I"%FREEIMAGE_DIR%\source" set HB_DLL_NAME=FreeImage set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbfimage/make_vc.bat b/harbour/contrib/hbfimage/make_vc.bat index 430c2de69d..1fca7bad79 100644 --- a/harbour/contrib/hbfimage/make_vc.bat +++ b/harbour/contrib/hbfimage/make_vc.bat @@ -15,7 +15,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%FREEIMAGE_DIR%\source +set CFLAGS=-I"%FREEIMAGE_DIR%\source" set HB_DLL_NAME=FreeImage set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist @@ -40,7 +40,7 @@ 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 diff --git a/harbour/contrib/hbfimage/tests/bld_b32.bat b/harbour/contrib/hbfimage/tests/bld_b32.bat index c26ae9561b..50cd025693 100644 --- a/harbour/contrib/hbfimage/tests/bld_b32.bat +++ b/harbour/contrib/hbfimage/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbfimage/tests/bld_vc.bat b/harbour/contrib/hbfimage/tests/bld_vc.bat index 8ac27ef1da..463e2afd43 100644 --- a/harbour/contrib/hbfimage/tests/bld_vc.bat +++ b/harbour/contrib/hbfimage/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbgd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat index f70a75dcf4..12a28dca20 100644 --- a/harbour/contrib/hbgd/make_b32.bat +++ b/harbour/contrib/hbgd/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%GD_DIR%\include +set CFLAGS=-I"%GD_DIR%\include" set HB_DLL_NAME=bgd set HB_DLL_DIR=%GD_DIR%\bin @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbgd/make_vc.bat b/harbour/contrib/hbgd/make_vc.bat index 92752605bc..a786d8a8a3 100644 --- a/harbour/contrib/hbgd/make_vc.bat +++ b/harbour/contrib/hbgd/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%GD_DIR%\include +set CFLAGS=-I"%GD_DIR%\include" set HB_DLL_NAME=bgd set HB_DLL_DIR=%GD_DIR%\bin @@ -39,7 +39,7 @@ 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 %GD_DIR%\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 "%GD_DIR%\lib\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbgd/tests/bld_b32.bat b/harbour/contrib/hbgd/tests/bld_b32.bat index d258416d2b..1c51632d50 100644 --- a/harbour/contrib/hbgd/tests/bld_b32.bat +++ b/harbour/contrib/hbgd/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbgd/tests/bld_vc.bat b/harbour/contrib/hbgd/tests/bld_vc.bat index b031d99d79..d38cbc01c2 100644 --- a/harbour/contrib/hbgd/tests/bld_vc.bat +++ b/harbour/contrib/hbgd/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbgf/tests/bld_b32.bat b/harbour/contrib/hbgf/tests/bld_b32.bat index d845535b6c..98f9db20a6 100644 --- a/harbour/contrib/hbgf/tests/bld_b32.bat +++ b/harbour/contrib/hbgf/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbgf/tests/bld_vc.bat b/harbour/contrib/hbgf/tests/bld_vc.bat index a7333b4f7b..6e5dd19e4c 100644 --- a/harbour/contrib/hbgf/tests/bld_vc.bat +++ b/harbour/contrib/hbgf/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbhpdf/make_b32.bat b/harbour/contrib/hbhpdf/make_b32.bat index 6639b72617..6867858488 100644 --- a/harbour/contrib/hbhpdf/make_b32.bat +++ b/harbour/contrib/hbhpdf/make_b32.bat @@ -15,7 +15,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%LIBHARU_DIR%\include +set CFLAGS=-I"%LIBHARU_DIR%\include" set HB_DLL_NAME=libhpdf set HB_DLL_DIR=%LIBHARU_DIR% @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbhpdf/make_vc.bat b/harbour/contrib/hbhpdf/make_vc.bat index 9bffd74b68..1624e944c6 100644 --- a/harbour/contrib/hbhpdf/make_vc.bat +++ b/harbour/contrib/hbhpdf/make_vc.bat @@ -15,7 +15,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%LIBHARU_DIR%\include +set CFLAGS=-I"%LIBHARU_DIR%\include" set HB_DLL_NAME=libhpdf set HB_DLL_DIR=%LIBHARU_DIR% @@ -40,7 +40,7 @@ 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 %LIBHARU_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 "%LIBHARU_DIR%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbhpdf/tests/bld_b32.bat b/harbour/contrib/hbhpdf/tests/bld_b32.bat index 37cab235c0..4d3572f111 100644 --- a/harbour/contrib/hbhpdf/tests/bld_b32.bat +++ b/harbour/contrib/hbhpdf/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbhpdf/tests/bld_vc.bat b/harbour/contrib/hbhpdf/tests/bld_vc.bat index 2dbdef26f5..c3047f8287 100644 --- a/harbour/contrib/hbhpdf/tests/bld_vc.bat +++ b/harbour/contrib/hbhpdf/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbmisc/tests/bld_b32.bat b/harbour/contrib/hbmisc/tests/bld_b32.bat index f1c019810d..6068e154c8 100644 --- a/harbour/contrib/hbmisc/tests/bld_b32.bat +++ b/harbour/contrib/hbmisc/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbmisc/tests/bld_vc.bat b/harbour/contrib/hbmisc/tests/bld_vc.bat index 24e49977c1..8c30804acf 100644 --- a/harbour/contrib/hbmisc/tests/bld_vc.bat +++ b/harbour/contrib/hbmisc/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbmysql/make_b32.bat b/harbour/contrib/hbmysql/make_b32.bat index 6bf4672aa5..98b5286350 100644 --- a/harbour/contrib/hbmysql/make_b32.bat +++ b/harbour/contrib/hbmysql/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%MYSQL_DIR%\include +set CFLAGS=-I"%MYSQL_DIR%\include" set HB_DLL_NAME=libmySQL set HB_DLL_DIR=%MYSQL_DIR%\bin @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbmysql/make_vc.bat b/harbour/contrib/hbmysql/make_vc.bat index 40187bc46a..9f0118a8bd 100644 --- a/harbour/contrib/hbmysql/make_vc.bat +++ b/harbour/contrib/hbmysql/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%MYSQL_DIR%\include +set CFLAGS=-I"%MYSQL_DIR%\include" set HB_DLL_NAME=libmySQL set HB_DLL_DIR=%MYSQL_DIR%\bin @@ -39,7 +39,7 @@ 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 %MYSQL_DIR%\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 "%MYSQL_DIR%\lib\opt\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbmysql/tests/bld_b32.bat b/harbour/contrib/hbmysql/tests/bld_b32.bat index 351528f62e..c73a36a4b9 100644 --- a/harbour/contrib/hbmysql/tests/bld_b32.bat +++ b/harbour/contrib/hbmysql/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbmysql/tests/bld_vc.bat b/harbour/contrib/hbmysql/tests/bld_vc.bat index de1af6ca29..dce94a7535 100644 --- a/harbour/contrib/hbmysql/tests/bld_vc.bat +++ b/harbour/contrib/hbmysql/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbnf/tests/bld_b32.bat b/harbour/contrib/hbnf/tests/bld_b32.bat index aee29748e2..e386ad5e92 100644 --- a/harbour/contrib/hbnf/tests/bld_b32.bat +++ b/harbour/contrib/hbnf/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbnf/tests/bld_vc.bat b/harbour/contrib/hbnf/tests/bld_vc.bat index 62e27750c4..f8837e026f 100644 --- a/harbour/contrib/hbnf/tests/bld_vc.bat +++ b/harbour/contrib/hbnf/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbodbc/make_b32.bat b/harbour/contrib/hbodbc/make_b32.bat index a846e211a8..32c232e549 100644 --- a/harbour/contrib/hbodbc/make_b32.bat +++ b/harbour/contrib/hbodbc/make_b32.bat @@ -26,7 +26,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbodbc/make_vc.bat b/harbour/contrib/hbodbc/make_vc.bat index e91fb2c5f2..4a4452615f 100644 --- a/harbour/contrib/hbodbc/make_vc.bat +++ b/harbour/contrib/hbodbc/make_vc.bat @@ -34,8 +34,8 @@ 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 diff --git a/harbour/contrib/hbodbc/tests/bld_b32.bat b/harbour/contrib/hbodbc/tests/bld_b32.bat index 69cb0f0f8f..43e021947d 100644 --- a/harbour/contrib/hbodbc/tests/bld_b32.bat +++ b/harbour/contrib/hbodbc/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbodbc/tests/bld_vc.bat b/harbour/contrib/hbodbc/tests/bld_vc.bat index 78c12f4663..a140f7dfae 100644 --- a/harbour/contrib/hbodbc/tests/bld_vc.bat +++ b/harbour/contrib/hbodbc/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbole/tests/bld_b32.bat b/harbour/contrib/hbole/tests/bld_b32.bat index be7e66f8d7..ed5e7af5a7 100644 --- a/harbour/contrib/hbole/tests/bld_b32.bat +++ b/harbour/contrib/hbole/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbole/tests/bld_vc.bat b/harbour/contrib/hbole/tests/bld_vc.bat index bfbf167b03..4b9aa3bb03 100644 --- a/harbour/contrib/hbole/tests/bld_vc.bat +++ b/harbour/contrib/hbole/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbpgsql/make_b32.bat b/harbour/contrib/hbpgsql/make_b32.bat index e118a957b8..dd9662b212 100644 --- a/harbour/contrib/hbpgsql/make_b32.bat +++ b/harbour/contrib/hbpgsql/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%PGSQL_DIR%\include +set CFLAGS=-I"%PGSQL_DIR%\include" rem .exe set HB_DLL_NAME=postgres set HB_DLL_DIR=%PGSQL_DIR%\bin @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.exe + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbpgsql/make_vc.bat b/harbour/contrib/hbpgsql/make_vc.bat index 70f91dada6..7bceb5a80b 100644 --- a/harbour/contrib/hbpgsql/make_vc.bat +++ b/harbour/contrib/hbpgsql/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%PGSQL_DIR%\include +set CFLAGS=-I"%PGSQL_DIR%\include" rem .exe set HB_DLL_NAME=postgres set HB_DLL_DIR=%PGSQL_DIR%\bin @@ -47,8 +47,8 @@ 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 diff --git a/harbour/contrib/hbpgsql/tests/bld_b32.bat b/harbour/contrib/hbpgsql/tests/bld_b32.bat index af39fcde59..aece0ff940 100644 --- a/harbour/contrib/hbpgsql/tests/bld_b32.bat +++ b/harbour/contrib/hbpgsql/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbpgsql/tests/bld_vc.bat b/harbour/contrib/hbpgsql/tests/bld_vc.bat index 1737f21bfb..731465f9aa 100644 --- a/harbour/contrib/hbpgsql/tests/bld_vc.bat +++ b/harbour/contrib/hbpgsql/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbtpathy/tests/bld_b32.bat b/harbour/contrib/hbtpathy/tests/bld_b32.bat index d8fb6e6bcf..b96bda9f4d 100644 --- a/harbour/contrib/hbtpathy/tests/bld_b32.bat +++ b/harbour/contrib/hbtpathy/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbtpathy/tests/bld_vc.bat b/harbour/contrib/hbtpathy/tests/bld_vc.bat index b4c1d30ead..13ec7942fe 100644 --- a/harbour/contrib/hbtpathy/tests/bld_vc.bat +++ b/harbour/contrib/hbtpathy/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbvpdf/tests/bld_b32.bat b/harbour/contrib/hbvpdf/tests/bld_b32.bat index fb0090c8f7..92853fee91 100644 --- a/harbour/contrib/hbvpdf/tests/bld_b32.bat +++ b/harbour/contrib/hbvpdf/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbvpdf/tests/bld_vc.bat b/harbour/contrib/hbvpdf/tests/bld_vc.bat index ad40d03dc8..387bcb5bce 100644 --- a/harbour/contrib/hbvpdf/tests/bld_vc.bat +++ b/harbour/contrib/hbvpdf/tests/bld_vc.bat @@ -3,13 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_BIN_INSTALL=..\..\..\bin set HB_INC_INSTALL=..\..\..\include diff --git a/harbour/contrib/hbw32/tests/bld_b32.bat b/harbour/contrib/hbw32/tests/bld_b32.bat index 6ac9d49b23..7b5a435668 100644 --- a/harbour/contrib/hbw32/tests/bld_b32.bat +++ b/harbour/contrib/hbw32/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbw32/tests/bld_vc.bat b/harbour/contrib/hbw32/tests/bld_vc.bat index aefad0ac54..1edda9e94d 100644 --- a/harbour/contrib/hbw32/tests/bld_vc.bat +++ b/harbour/contrib/hbw32/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbw32ddr/make_b32.bat b/harbour/contrib/hbw32ddr/make_b32.bat index 2c55dfde3d..38b93a03a7 100644 --- a/harbour/contrib/hbw32ddr/make_b32.bat +++ b/harbour/contrib/hbw32ddr/make_b32.bat @@ -32,7 +32,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbw32ddr/make_vc.bat b/harbour/contrib/hbw32ddr/make_vc.bat index d9e23ed9ef..23781b23b6 100644 --- a/harbour/contrib/hbw32ddr/make_vc.bat +++ b/harbour/contrib/hbw32ddr/make_vc.bat @@ -34,8 +34,8 @@ 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 diff --git a/harbour/contrib/hbw32ddr/tests/bld_b32.bat b/harbour/contrib/hbw32ddr/tests/bld_b32.bat index ef88395ab1..494cdc1a94 100644 --- a/harbour/contrib/hbw32ddr/tests/bld_b32.bat +++ b/harbour/contrib/hbw32ddr/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbw32ddr/tests/bld_vc.bat b/harbour/contrib/hbw32ddr/tests/bld_vc.bat index 789b2d985f..872b87d293 100644 --- a/harbour/contrib/hbw32ddr/tests/bld_vc.bat +++ b/harbour/contrib/hbw32ddr/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index 58bbdc6006..597c9fac68 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%ZLIB_DIR%\include +set CFLAGS=-I"%ZLIB_DIR%\include" set HB_DLL_NAME=zlib1 set HB_DLL_DIR=%ZLIB_DIR% @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib -a ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib -a ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index 1f3202b147..f445fb892c 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -14,7 +14,7 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%ZLIB_DIR%\include +set CFLAGS=-I"%ZLIB_DIR%\include" set HB_DLL_NAME=zlib1 set HB_DLL_DIR=%ZLIB_DIR% @@ -39,7 +39,7 @@ 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 %ZLIB_DIR%\lib\zdll.lib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if not exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy "%ZLIB_DIR%\lib\zdll.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbzlib/tests/bld_b32.bat b/harbour/contrib/hbzlib/tests/bld_b32.bat index 99e4751b33..f25c1d67e8 100644 --- a/harbour/contrib/hbzlib/tests/bld_b32.bat +++ b/harbour/contrib/hbzlib/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/hbzlib/tests/bld_vc.bat b/harbour/contrib/hbzlib/tests/bld_vc.bat index 0250b048d9..be551cddc0 100644 --- a/harbour/contrib/hbzlib/tests/bld_vc.bat +++ b/harbour/contrib/hbzlib/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/rddado/tests/bld_b32.bat b/harbour/contrib/rddado/tests/bld_b32.bat index 16d3834407..2acecae298 100644 --- a/harbour/contrib/rddado/tests/bld_b32.bat +++ b/harbour/contrib/rddado/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/rddado/tests/bld_vc.bat b/harbour/contrib/rddado/tests/bld_vc.bat index 8c9afeb0d7..35c8f6d089 100644 --- a/harbour/contrib/rddado/tests/bld_vc.bat +++ b/harbour/contrib/rddado/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 59f46b8533..0f4b2e2939 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -56,17 +56,18 @@ #define SUPERTABLE ( &adsSuper ) #define MAX_STR_LEN 255 -#include "hbapi.h" +#include "hbvm.h" #include "hbinit.h" +#include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" #include "hbdbferr.h" #include "hbapilng.h" #include "hbdate.h" -#include "rddads.h" #include "hbset.h" -#include "hbvm.h" + #include "rddsys.ch" +#include "rddads.h" #include diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index f0c667d15b..fca4b85096 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -52,14 +52,14 @@ #define HB_OS_WIN_32_USED +#include "hbvm.h" #include "hbapi.h" #include "hbapiitm.h" -#include "hbinit.h" -#include "hbvm.h" -#include "rddsys.ch" +#include "hbapierr.h" #include "hbapilng.h" #include "hbdate.h" -#include "hbapierr.h" + +#include "rddsys.ch" #include "rddads.h" #define HARBOUR_MAX_RDD_FILTER_LENGTH 256 @@ -669,13 +669,10 @@ HB_FUNC( ADSADDCUSTOMKEY ) hb_retnl( ( long ) AdsAddCustomKey( hIndex ) ); } + else if( pArea->hOrdCurrent != 0 ) + hb_retnl( ( long ) AdsAddCustomKey( pArea->hOrdCurrent ) ); else - { - if( pArea->hOrdCurrent != 0 ) - hb_retnl( ( long ) AdsAddCustomKey( pArea->hOrdCurrent ) ); - else - hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, "ADSADDCUSTOMKEY" ); - } + hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, "ADSADDCUSTOMKEY" ); } else hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, "ADSADDCUSTOMKEY" ); @@ -703,15 +700,13 @@ HB_FUNC( ADSDELETECUSTOMKEY ) ( UNSIGNED8 * ) hb_parcx( 1 ) /* ordName */, &hIndex ); } + hb_retnl( ( long ) AdsDeleteCustomKey( hIndex ) ); } + else if( pArea->hOrdCurrent != 0 ) + hb_retnl( ( long ) AdsDeleteCustomKey( pArea->hOrdCurrent ) ); else - { - if( pArea->hOrdCurrent != 0 ) - hb_retnl( ( long ) AdsDeleteCustomKey( pArea->hOrdCurrent ) ); - else - hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, "ADSDELETECUSTOMKEY" ); - } + hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, "ADSDELETECUSTOMKEY" ); } else hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, "ADSDELETECUSTOMKEY" ); @@ -1427,8 +1422,7 @@ UNSIGNED32 WINAPI hb_adsShowPercentageCB( UNSIGNED16 usPercentDone ) HB_TRACE(HB_TR_DEBUG, ("hb_adsShowPercentageCB(%d) called with no codeblock set.\n", usPercentDone )); return 0; - -} /* hb_adsShowPercentageCB() */ +} HB_FUNC( ADSREGCALLBACK ) { diff --git a/harbour/contrib/rddads/adsmgmnt.c b/harbour/contrib/rddads/adsmgmnt.c index 80ea606335..a12afbe3a7 100644 --- a/harbour/contrib/rddads/adsmgmnt.c +++ b/harbour/contrib/rddads/adsmgmnt.c @@ -52,11 +52,11 @@ #define HB_OS_WIN_32_USED -#include "rddads.h" - #include "hbapi.h" #include "hbapiitm.h" +#include "rddads.h" + static ADSHANDLE s_hMgmtHandle = 0; HB_FUNC( ADSMGCONNECT ) diff --git a/harbour/contrib/rddads/make_b32.bat b/harbour/contrib/rddads/make_b32.bat index 76f3f9f5ae..37f0ded365 100644 --- a/harbour/contrib/rddads/make_b32.bat +++ b/harbour/contrib/rddads/make_b32.bat @@ -14,13 +14,13 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%ADS_DIR% +set CFLAGS=-I"%ADS_DIR%" set HB_DLL_NAME=ace32 if exist "%ADS_DIR%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute if exist "%ADS_DIR%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR% if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\32bit -echo Using this .dll: %HB_DLL_DIR%\%HB_DLL_NAME%.dll +echo Using this .dll: "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" rem --------------------------------------------------------------- @@ -42,7 +42,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/rddads/make_vc.bat b/harbour/contrib/rddads/make_vc.bat index c99c33ebe9..77b1b5759f 100644 --- a/harbour/contrib/rddads/make_vc.bat +++ b/harbour/contrib/rddads/make_vc.bat @@ -14,13 +14,13 @@ goto POST_EXIT :DIR_OK -set CFLAGS=-I%ADS_DIR% +set CFLAGS=-I"%ADS_DIR%" set HB_DLL_NAME=ace32 if exist "%ADS_DIR%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute if exist "%ADS_DIR%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR% if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\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,7 +43,7 @@ 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 %ADS_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 "%ADS_DIR%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h index af6df90d02..8e4f230730 100644 --- a/harbour/contrib/rddads/rddads.h +++ b/harbour/contrib/rddads/rddads.h @@ -84,6 +84,7 @@ #define _ADS_LIB_VERSION 500 #endif +#if 0 /* Compatibility ACE version override. Usage is discouraged and unnecessary unless we want to override autodetection. For the latter, ADS_LIB_VERSION @@ -97,11 +98,12 @@ #elif ADS_REQUIRE_VERSION == 7 #define ADS_LIB_VERSION 700 #elif ADS_REQUIRE_VERSION == 8 - #define ADS_LIB_VERSION 800 + #define ADS_LIB_VERSION 810 #elif ADS_REQUIRE_VERSION == 9 #define ADS_LIB_VERSION 900 #endif #endif +#endif /* Make sure to not allow a manual override requesting a higher version than the one of ACE. [vszakats] */ diff --git a/harbour/contrib/rddads/tests/bld_b32.bat b/harbour/contrib/rddads/tests/bld_b32.bat index 1ccc7e860b..d3434ce4ac 100644 --- a/harbour/contrib/rddads/tests/bld_b32.bat +++ b/harbour/contrib/rddads/tests/bld_b32.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=bcc32 diff --git a/harbour/contrib/rddads/tests/bld_vc.bat b/harbour/contrib/rddads/tests/bld_vc.bat index 9a60dc9852..4a9781ae6e 100644 --- a/harbour/contrib/rddads/tests/bld_vc.bat +++ b/harbour/contrib/rddads/tests/bld_vc.bat @@ -3,17 +3,9 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem This is a generic template file, if it doesn't fit your own needs -rem please DON'T MODIFY IT. -rem -rem Instead, make a local copy and modify that one, or make a call to -rem this batch file from your customized one. [vszakats] -rem --------------------------------------------------------------- - -set HB_BIN_INSTALL=..\..\..\bin -set HB_INC_INSTALL=..\..\..\include -set HB_LIB_INSTALL=..\..\..\lib +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include set HB_ARCHITECTURE=w32 set HB_COMPILER=msvc