From 51ac0c49e06d39e337aa0bc4b544162994bea73a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 23 Nov 2007 02:21:17 +0000 Subject: [PATCH] 2007-11-23 03:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/apollo/make_b32.bat * contrib/apollo/make_vc.bat * contrib/examples/dbu/bld_b32.bat * contrib/firebird/make_b32.bat * contrib/firebird/make_vc.bat * contrib/freeimage/make_b32.bat * contrib/freeimage/make_vc.bat * contrib/gd/make_b32.bat * contrib/gd/make_vc.bat * contrib/hbzlib/make_b32.bat * contrib/hbzlib/make_vc.bat * contrib/mysql/make_b32.bat * contrib/mysql/make_vc.bat * contrib/odbc/make_b32.bat * contrib/odbc/make_vc.bat * contrib/pdflib/make_b32.bat * contrib/pdflib/make_vc.bat * contrib/pgsql/make_b32.bat * contrib/pgsql/make_vc.bat * contrib/rdd_ads/make_b32.bat * contrib/rdd_ads/make_vc.bat + Accepts "Install" and "Clean" consistently. * Not using "exit" command anymore. ! Restored some lost changes. ! Not directly modifying C_USR, instead use CFLAGS internally. + Now rddads will find ace32.dll in system32 dir too. ; It's not possible to set HB_DLL_DIR directly now, just through the _DIR envvar. Some contribs may try to "autodetect" the exact location of the .dll (currently rddads). --- harbour/ChangeLog | 34 +++++++++++++++++++++++- harbour/contrib/apollo/make_b32.bat | 15 ++++++----- harbour/contrib/apollo/make_vc.bat | 15 ++++++----- harbour/contrib/examples/dbu/bld_b32.bat | 9 +++---- harbour/contrib/firebird/make_b32.bat | 15 ++++++----- harbour/contrib/firebird/make_vc.bat | 15 ++++++----- harbour/contrib/freeimage/make_b32.bat | 15 ++++++----- harbour/contrib/freeimage/make_vc.bat | 15 ++++++----- harbour/contrib/gd/make_b32.bat | 19 +++++++------ harbour/contrib/gd/make_vc.bat | 19 +++++++------ harbour/contrib/hbzlib/make_b32.bat | 2 +- harbour/contrib/hbzlib/make_vc.bat | 2 +- harbour/contrib/mysql/make_b32.bat | 15 ++++++----- harbour/contrib/mysql/make_vc.bat | 15 ++++++----- harbour/contrib/odbc/make_b32.bat | 4 ++- harbour/contrib/odbc/make_vc.bat | 4 ++- harbour/contrib/pdflib/make_b32.bat | 13 ++++----- harbour/contrib/pdflib/make_vc.bat | 13 ++++----- harbour/contrib/pgsql/make_b32.bat | 15 ++++++----- harbour/contrib/pgsql/make_vc.bat | 15 ++++++----- harbour/contrib/rdd_ads/make_b32.bat | 25 ++++++++++++++--- harbour/contrib/rdd_ads/make_vc.bat | 25 ++++++++++++++--- 22 files changed, 208 insertions(+), 111 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fb168d3277..cbb4694f25 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,38 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-23 03:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/apollo/make_b32.bat + * contrib/apollo/make_vc.bat + * contrib/examples/dbu/bld_b32.bat + * contrib/firebird/make_b32.bat + * contrib/firebird/make_vc.bat + * contrib/freeimage/make_b32.bat + * contrib/freeimage/make_vc.bat + * contrib/gd/make_b32.bat + * contrib/gd/make_vc.bat + * contrib/hbzlib/make_b32.bat + * contrib/hbzlib/make_vc.bat + * contrib/mysql/make_b32.bat + * contrib/mysql/make_vc.bat + * contrib/odbc/make_b32.bat + * contrib/odbc/make_vc.bat + * contrib/pdflib/make_b32.bat + * contrib/pdflib/make_vc.bat + * contrib/pgsql/make_b32.bat + * contrib/pgsql/make_vc.bat + * contrib/rdd_ads/make_b32.bat + * contrib/rdd_ads/make_vc.bat + + Accepts "Install" and "Clean" consistently. + * Not using "exit" command anymore. + ! Restored some lost changes. + ! Not directly modifying C_USR, instead use CFLAGS internally. + + Now rddads will find ace32.dll in system32 dir too. + ; It's not possible to set HB_DLL_DIR directly now, + just through the _DIR envvar. Some contribs + may try to "autodetect" the exact location of the .dll + (currently rddads). + 2007-11-23 03:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * make_b32.mak * make_gcc.mak @@ -156,7 +188,7 @@ * include/hbextern.ch * source/rtl/memofile.c ! MEMOWRIT() 3rd parameter marked as extension. - + HB_MEMOWRIT() function added, which never write the + + HB_MEMOWRIT() function added, which never writes the obsolete EOF char at the end of the file. 2007-11-23 03:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat index a1db878817..1aeb59a7c6 100644 --- a/harbour/contrib/apollo/make_b32.bat +++ b/harbour/contrib/apollo/make_b32.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%APOLLO_DIR%" == "" goto EXEC -echo APOLLO_DIR environment variable has to be defined ! +if not "%APOLLO_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Apollo headers and lib and this envvar echo to be set to successfully build this library: echo set APOLLO_DIR=C:\Apollo echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%APOLLO_DIR%\include +:DIR_OK + +set CFLAGS=%C_USR% -I%APOLLO_DIR%\include set HB_DLL_NAME=sde61 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%APOLLO_DIR% +set HB_DLL_DIR=%APOLLO_DIR% rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat index 8b81e3c319..28a078267f 100644 --- a/harbour/contrib/apollo/make_vc.bat +++ b/harbour/contrib/apollo/make_vc.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%APOLLO_DIR%" == "" goto EXEC -echo APOLLO_DIR environment variable has to be defined ! +if not "%APOLLO_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Apollo headers and lib and this envvar echo to be set to successfully build this library: echo set APOLLO_DIR=C:\Apollo echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%APOLLO_DIR%\include +:DIR_OK + +set CFLAGS=%C_USR% -I%APOLLO_DIR%\include set HB_DLL_NAME=sde61 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%APOLLO_DIR% +set HB_DLL_DIR=%APOLLO_DIR% rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/examples/dbu/bld_b32.bat b/harbour/contrib/examples/dbu/bld_b32.bat index ab242f2e91..d6149f4390 100644 --- a/harbour/contrib/examples/dbu/bld_b32.bat +++ b/harbour/contrib/examples/dbu/bld_b32.bat @@ -4,11 +4,9 @@ rem $Id$ rem set DBU_DIR=%CLIPPER_DIR%\SOURCE\DBU -if exist "%DBU_DIR%\DBU.PRG" goto BUILD +if exist "%DBU_DIR%\DBU.PRG" goto DIR_OK set DBU_DIR=. -if exist "%DBU_DIR%\DBU.PRG" goto BUILD - -:HELP +if exist "%DBU_DIR%\DBU.PRG" goto DIR_OK echo --------------------------------------------------------------- echo IMPORTANT: You'll either need to copy the original CA-Cl*pper @@ -17,10 +15,9 @@ echo your original CA-Cl*pper installation (with DBU sources echo in SOURCE\DBU): echo set CLIPPER_DIR=C:\CLIPPER5 echo --------------------------------------------------------------- - goto EXIT -:BUILD +:DIR_OK ..\..\..\bin\harbour /n %DBU_DIR%\DBU.PRG /i..\..\..\include\ ..\..\..\bin\harbour /n %DBU_DIR%\DBUCOPY.PRG /i..\..\..\include\ diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/firebird/make_b32.bat index 85cae6b2b8..e5178a2ec1 100644 --- a/harbour/contrib/firebird/make_b32.bat +++ b/harbour/contrib/firebird/make_b32.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%FIREBIRD_DIR%" == "" goto EXEC -echo FIREBIRD_DIR environment variable has to be defined ! +if not "%FIREBIRD_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Firebird package and this envvar echo to be set to successfully build this library: echo set FIREBIRD_DIR=C:\Firebird echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=fbclient -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FIREBIRD_DIR%\bin +set HB_DLL_DIR=%FIREBIRD_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/firebird/make_vc.bat index c2b943b154..1f5c533c64 100644 --- a/harbour/contrib/firebird/make_vc.bat +++ b/harbour/contrib/firebird/make_vc.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%FIREBIRD_DIR%" == "" goto EXEC -echo FIREBIRD_DIR environment variable has to be defined ! +if not "%FIREBIRD_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Firebird package and this envvar echo to be set to successfully build this library: echo set FIREBIRD_DIR=C:\Firebird echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=fbclient -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FIREBIRD_DIR%\bin +set HB_DLL_DIR=%FIREBIRD_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/freeimage/make_b32.bat index 5e040ab0f9..4d10fb5a00 100644 --- a/harbour/contrib/freeimage/make_b32.bat +++ b/harbour/contrib/freeimage/make_b32.bat @@ -3,20 +3,21 @@ rem rem $Id$ rem -if NOT "%FREEIMAGE_DIR%" == "" goto EXEC -echo FREEIMAGE_DIR environment variable has to be defined ! +if not "%FREEIMAGE_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Freeimage headers and binary from here: echo http://freeimage.sourceforge.net/download.html echo and this envvar to be set to successfully build this library: echo set FREEIMAGE_DIR=C:\FreeImage echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED set HB_DLL_NAME=FreeImage -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist +set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist rem --------------------------------------------------------------- @@ -30,8 +31,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/freeimage/make_vc.bat index 7721600f29..582a2d37e6 100644 --- a/harbour/contrib/freeimage/make_vc.bat +++ b/harbour/contrib/freeimage/make_vc.bat @@ -3,20 +3,21 @@ rem rem $Id$ rem -if NOT "%FREEIMAGE_DIR%" == "" goto EXEC -echo FREEIMAGE_DIR environment variable has to be defined ! +if not "%FREEIMAGE_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need Freeimage headers and binary from here: echo http://freeimage.sourceforge.net/download.html echo and this envvar to be set to successfully build this library: echo set FREEIMAGE_DIR=C:\FreeImage echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED set HB_DLL_NAME=FreeImage -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist +set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist rem --------------------------------------------------------------- @@ -30,8 +31,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat index 5daa39ed91..690998e7a1 100644 --- a/harbour/contrib/gd/make_b32.bat +++ b/harbour/contrib/gd/make_b32.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%GD_DIR%" == "" goto EXEC -echo GD_DIR environment variable has to be defined ! +if not "%GD_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- -echo IMPORTANT: You'll need GD lib package from www.libgd.org and this -echo envvar to be set to successfully build this library: +echo IMPORTANT: You'll need GD lib package from www.libgd.org and this envvar +echo to be set to successfully build this library: echo set GD_DIR=-IC:\gd echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%GD_DIR%\include +:DIR_OK + +set CFLAGS=%C_USR% -I%GD_DIR%\include set HB_DLL_NAME=bgd -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%GD_DIR%\bin +set HB_DLL_DIR=%GD_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat index 2fef5b77c9..986d1a0aa4 100644 --- a/harbour/contrib/gd/make_vc.bat +++ b/harbour/contrib/gd/make_vc.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%GD_DIR%" == "" goto EXEC -echo GD_DIR environment variable has to be defined ! +if not "%GD_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- -echo IMPORTANT: You'll need GD lib package from www.libgd.org and this -echo envvar to be set to successfully build this library: +echo IMPORTANT: You'll need GD lib package from www.libgd.org and this envvar +echo to be set to successfully build this library: echo set GD_DIR=-IC:\gd echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%GD_DIR%\include +:DIR_OK + +set CFLAGS=%C_USR% -I%GD_DIR%\include set HB_DLL_NAME=bgd -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%GD_DIR%\bin +set HB_DLL_DIR=%GD_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index c4f404918a..22346c35ab 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -set C_USR=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k- +set CFLAGS=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k- call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index 1240335bcc..4ad62a3fcc 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -set C_USR=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT +set CFLAGS=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat index 335c946a2e..9284e34151 100644 --- a/harbour/contrib/mysql/make_b32.bat +++ b/harbour/contrib/mysql/make_b32.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%MYSQL_DIR%" == "" goto EXEC -echo MYSQL_DIR environment variable has to be defined ! +if not "%MYSQL_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need MySQL package and this envvar echo to be set to successfully build this library: echo set MYSQL_DIR=C:\mysql echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=libmySQL -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%MYSQL_DIR%\bin +set HB_DLL_DIR=%MYSQL_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat index 0959ff04ce..c4c6470752 100644 --- a/harbour/contrib/mysql/make_vc.bat +++ b/harbour/contrib/mysql/make_vc.bat @@ -3,19 +3,20 @@ rem rem $Id$ rem -if NOT "%MYSQL_DIR%" == "" goto EXEC -echo MYSQL_DIR environment variable has to be defined ! +if not "%MYSQL_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need MySQL package and this envvar echo to be set to successfully build this library: echo set MYSQL_DIR=C:\mysql echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=libmySQL -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%MYSQL_DIR%\bin +set HB_DLL_DIR=%MYSQL_DIR%\bin rem --------------------------------------------------------------- @@ -29,8 +30,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/odbc/make_b32.bat b/harbour/contrib/odbc/make_b32.bat index 28631f5e5a..358215396b 100644 --- a/harbour/contrib/odbc/make_b32.bat +++ b/harbour/contrib/odbc/make_b32.bat @@ -4,7 +4,7 @@ rem $Id$ rem set HB_DLL_NAME=odbc32 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 +set HB_DLL_DIR=%SystemRoot%\system32 rem --------------------------------------------------------------- @@ -18,8 +18,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat index e5598c7edb..6f49147348 100644 --- a/harbour/contrib/odbc/make_vc.bat +++ b/harbour/contrib/odbc/make_vc.bat @@ -4,7 +4,7 @@ rem $Id$ rem set HB_DLL_NAME=odbc32 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 +set HB_DLL_DIR=%SystemRoot%\system32 rem --------------------------------------------------------------- @@ -18,8 +18,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat index 057fe00e81..6e6b6ce671 100644 --- a/harbour/contrib/pdflib/make_b32.bat +++ b/harbour/contrib/pdflib/make_b32.bat @@ -3,8 +3,8 @@ rem rem $Id$ rem -if NOT "%PDFLIB_DIR%" == "" goto EXEC -echo PDFLIB_DIR environment variable has to be defined ! +if not "%PDFLIB_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need PDFLIB sources and this envvar echo to be set to successfully build this library: @@ -12,11 +12,8 @@ echo set PDFLIB_DIR=C:\pdflib echo --------------------------------------------------------------- exit 1 -:EXEC -set C_USR=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 - -goto EXIT - -:EXIT diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat index 251d94b8f5..d6242fda8f 100644 --- a/harbour/contrib/pdflib/make_vc.bat +++ b/harbour/contrib/pdflib/make_vc.bat @@ -3,8 +3,8 @@ rem rem $Id$ rem -if NOT "%PDFLIB_DIR%" == "" goto EXEC -echo PDFLIB_DIR environment variable has to be defined ! +if not "%PDFLIB_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need PDFLIB sources and this envvar echo to be set to successfully build this library: @@ -12,11 +12,8 @@ echo set PDFLIB_DIR=C:\pdflib echo --------------------------------------------------------------- exit 1 -:EXEC -set C_USR=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 - -goto EXIT - -:EXIT diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat index bd7604ec98..cf5fd55da4 100644 --- a/harbour/contrib/pgsql/make_b32.bat +++ b/harbour/contrib/pgsql/make_b32.bat @@ -3,20 +3,21 @@ rem rem $Id$ rem -if NOT "%PGSQL_DIR%" == "" goto EXEC -echo PGSQL_DIR environment variable has to be defined ! +if not "%PGSQL_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need PostreSQL package and this envvar echo to be set to successfully build this library: echo set PGSQL_DIR=C:\pgsql echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED rem .exe set HB_DLL_NAME=postgres -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%PGSQL_DIR%\bin +set HB_DLL_DIR=%PGSQL_DIR%\bin rem --------------------------------------------------------------- @@ -30,8 +31,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat index 64e5af7645..5641e79bee 100644 --- a/harbour/contrib/pgsql/make_vc.bat +++ b/harbour/contrib/pgsql/make_vc.bat @@ -3,20 +3,21 @@ rem rem $Id$ rem -if NOT "%PGSQL_DIR%" == "" goto EXEC -echo PGSQL_DIR environment variable has to be defined ! +if not "%PGSQL_DIR%" == "" goto DIR_OK + echo --------------------------------------------------------------- echo IMPORTANT: You'll need PostreSQL package and this envvar echo to be set to successfully build this library: echo set PGSQL_DIR=C:\pgsql echo --------------------------------------------------------------- -exit 1 +goto POST_EXIT -:EXEC -set C_USR=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED +:DIR_OK + +set CFLAGS=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED rem .exe set HB_DLL_NAME=postgres -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%PGSQL_DIR%\bin +set HB_DLL_DIR=%PGSQL_DIR%\bin rem --------------------------------------------------------------- @@ -30,8 +31,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 7e0ea91f65..6c50982c4b 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -3,12 +3,27 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need Advantage Client Engine installed. -rem --------------------------------------------------------------- +if not "%ADS_DIR%" == "" goto DIR_OK +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Advantage Client Engine installed and +echo these envvars set to successfully build this library: +echo set ACE_VER=810 +echo set ACE_DIR=C:\ads\acesdk +echo --------------------------------------------------------------- +goto POST_EXIT + +:DIR_OK + +set CFLAGS=%C_USR% -I%ADS_DIR% set HB_DLL_NAME=ace32 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 +if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\32bit +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%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR% +if exist "%SystemRoot%\system32\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%SystemRoot%\system32 + +echo Using this .dll: %HB_DLL_DIR%\%HB_DLL_NAME%.dll rem --------------------------------------------------------------- @@ -22,8 +37,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index 10b64d5df8..17267d3022 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -3,12 +3,27 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need Advantage Client Engine installed. -rem --------------------------------------------------------------- +if not "%ADS_DIR%" == "" goto DIR_OK +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Advantage Client Engine installed and +echo these envvars set to successfully build this library: +echo set ACE_VER=810 +echo set ACE_DIR=C:\ads\acesdk +echo --------------------------------------------------------------- +goto POST_EXIT + +:DIR_OK + +set CFLAGS=%C_USR% -I%ADS_DIR% set HB_DLL_NAME=ace32 -if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 +if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\32bit +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%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR% +if exist "%SystemRoot%\system32\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%SystemRoot%\system32 + +echo Using this .dll: %HB_DLL_DIR%\%HB_DLL_NAME%.dll rem --------------------------------------------------------------- @@ -22,8 +37,10 @@ set _HB_LIB_INSTALL=%HB_LIB_INSTALL% if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN if "%1" == "CLEAN" goto POST_CLEAN if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD