2008-05-29 17:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* contrib/hbmysql/make_gcc.sh
   * contrib/hbmysql/make_b32.bat
   * contrib/hbmysql/make_vc.bat
   * contrib/make_b32_all.bat
   * contrib/make_gcc_all.sh
   * contrib/hbfbird/make_gcc.sh
   * contrib/hbfbird/make_b32.bat
   * contrib/hbfbird/make_vc.bat
   * contrib/hbapollo/make_gcc.sh
   * contrib/hbapollo/make_b32.bat
   * contrib/hbapollo/make_vc.bat
   * contrib/make_vc_all.bat
   * contrib/hbhpdf/make_gcc.sh
   * contrib/hbhpdf/make_b32.bat
   * contrib/hbhpdf/make_vc.bat
   * contrib/hbpgsql/make_gcc.sh
   * contrib/hbpgsql/make_b32.bat
   * contrib/hbpgsql/make_vc.bat
   * contrib/rddads/make_gcc.sh
   * contrib/rddads/make_b32.bat
   * contrib/rddads/make_vc.bat
   * contrib/hbfimage/make_gcc.sh
   * contrib/hbfimage/make_b32.bat
   * contrib/hbfimage/make_vc.bat
   * contrib/hbgd/make_b32.bat
   * contrib/hbgd/make_gcc.sh
   * contrib/hbgd/make_vc.bat
     * Changed envvars pointing to external packages to comply 
       with our own rules:
          APOLLO_DIR    -> HB_DIR_APOLLO   
          FIREBIRD_DIR  -> HB_DIR_FIREBIRD 
          FREEIMAGE_DIR -> HB_DIR_FREEIMAGE
          GD_DIR        -> HB_DIR_GD       
          MYSQL_DIR     -> HB_DIR_MYSQL    
          PDFLIB_DIR    -> HB_DIR_PDFLIB   
          PGSQL_DIR     -> HB_DIR_PGSQL    
          ADS_DIR       -> HB_DIR_ADS      
          LIBHARU_DIR   -> HB_DIR_LIBHARU  
          (same rule for <package>_INC -> HB_INC_<package>)
       Sorry folks, but you'll need to update your env.
       (I can send a 'gsar' script to help that)
     + Added option for non-GNU BCC/VC contrib makes to 
       accept HB_INC_<package> format envvars to specify 
       the include dir only, so that we're now in sync with 
       the non-GNU GCC build system (make_gcc.sh).
     ; TODO: HB_LIB_<package> (or HB_BIN_<package>) is still 
       to be done any .dll/.lib handling.
This commit is contained in:
Viktor Szakats
2008-05-29 15:41:22 +00:00
parent e9afeddcdb
commit 05de32a8d7
28 changed files with 197 additions and 132 deletions

View File

@@ -8,6 +8,55 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-29 17:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmysql/make_gcc.sh
* contrib/hbmysql/make_b32.bat
* contrib/hbmysql/make_vc.bat
* contrib/make_b32_all.bat
* contrib/make_gcc_all.sh
* contrib/hbfbird/make_gcc.sh
* contrib/hbfbird/make_b32.bat
* contrib/hbfbird/make_vc.bat
* contrib/hbapollo/make_gcc.sh
* contrib/hbapollo/make_b32.bat
* contrib/hbapollo/make_vc.bat
* contrib/make_vc_all.bat
* contrib/hbhpdf/make_gcc.sh
* contrib/hbhpdf/make_b32.bat
* contrib/hbhpdf/make_vc.bat
* contrib/hbpgsql/make_gcc.sh
* contrib/hbpgsql/make_b32.bat
* contrib/hbpgsql/make_vc.bat
* contrib/rddads/make_gcc.sh
* contrib/rddads/make_b32.bat
* contrib/rddads/make_vc.bat
* contrib/hbfimage/make_gcc.sh
* contrib/hbfimage/make_b32.bat
* contrib/hbfimage/make_vc.bat
* contrib/hbgd/make_b32.bat
* contrib/hbgd/make_gcc.sh
* contrib/hbgd/make_vc.bat
* Changed envvars pointing to external packages to comply
with our own rules:
APOLLO_DIR -> HB_DIR_APOLLO
FIREBIRD_DIR -> HB_DIR_FIREBIRD
FREEIMAGE_DIR -> HB_DIR_FREEIMAGE
GD_DIR -> HB_DIR_GD
MYSQL_DIR -> HB_DIR_MYSQL
PDFLIB_DIR -> HB_DIR_PDFLIB
PGSQL_DIR -> HB_DIR_PGSQL
ADS_DIR -> HB_DIR_ADS
LIBHARU_DIR -> HB_DIR_LIBHARU
(same rule for <package>_INC -> HB_INC_<package>)
Sorry folks, but you'll need to update your env.
(I can send a 'gsar' script to help that)
+ Added option for non-GNU BCC/VC contrib makes to
accept HB_INC_<package> format envvars to specify
the include dir only, so that we're now in sync with
the non-GNU GCC build system (make_gcc.sh).
; TODO: HB_LIB_<package> (or HB_BIN_<package>) is still
to be done any .dll/.lib handling.
2008-05-29 17:02 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/tget.prg
* ::picture(), ::PutMask(), ::unTransform() moved next

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%APOLLO_DIR%" == "" goto DIR_OK
if not "%HB_DIR_APOLLO%" == "" 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 set HB_DIR_APOLLO=C:\Apollo
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%APOLLO_DIR%\include"
if "%HB_INC_APOLLO%" == "" set HB_INC_APOLLO=%HB_DIR_APOLLO%\include
set CFLAGS=-I"%HB_INC_APOLLO%"
set HB_DLL_NAME=sde61
set HB_DLL_DIR=%APOLLO_DIR%
set HB_DLL_DIR=%HB_DIR_APOLLO%
rem ---------------------------------------------------------------

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${APOLLO_INC}" == "" ]
if [ "${HB_INC_APOLLO}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need Apollo package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export APOLLO_INC=C:/Apollo/include"
echo " export HB_INC_APOLLO=C:/Apollo/include"
echo " or"
echo " export APOLLO_INC=/usr/include/apollo"
echo " export HB_INC_APOLLO=/usr/include/apollo"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${APOLLO_INC}; do
for I in ${HB_INC_APOLLO}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%APOLLO_DIR%" == "" goto DIR_OK
if not "%HB_DIR_APOLLO%" == "" 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 set HB_DIR_APOLLO=C:\Apollo
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%APOLLO_DIR%\include"
if "%HB_INC_APOLLO%" == "" set HB_INC_APOLLO=%HB_DIR_APOLLO%\include
set CFLAGS=-I"%HB_INC_APOLLO%"
set HB_DLL_NAME=sde61
set HB_DLL_DIR=%APOLLO_DIR%
set HB_DLL_DIR=%HB_DIR_APOLLO%
rem ---------------------------------------------------------------

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%FIREBIRD_DIR%" == "" goto DIR_OK
if not "%HB_DIR_FIREBIRD%" == "" 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 set HB_DIR_FIREBIRD=C:\Firebird
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%FIREBIRD_DIR%\include"
if "%HB_INC_FIREBIRD%" == "" set HB_INC_FIREBIRD=%HB_DIR_FIREBIRD%\include
set CFLAGS=-I"%HB_INC_FIREBIRD%"
set HB_DLL_NAME=fbclient
set HB_DLL_DIR=%FIREBIRD_DIR%\bin
set HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin
rem ---------------------------------------------------------------
@@ -39,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 "%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 "%HB_DIR_FIREBIRD%\%HB_DLL_NAME%_bor.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${FIREBIRD_INC}" == "" ]
if [ "${HB_INC_FIREBIRD}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You'll need Firebird package and this envvar"
echo " to be set to successfully build this library:"
echo " export FIREBIRD_INC=C:/Firebird/include"
echo " export HB_INC_FIREBIRD=C:/Firebird/include"
echo " or"
echo " export FIREBIRD_INC=/usr/include/firebird"
echo " export HB_INC_FIREBIRD=/usr/include/firebird"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${FIREBIRD_INC}; do
for I in ${HB_INC_FIREBIRD}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%FIREBIRD_DIR%" == "" goto DIR_OK
if not "%HB_DIR_FIREBIRD%" == "" 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 set HB_DIR_FIREBIRD=C:\Firebird
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%FIREBIRD_DIR%\include"
if "%HB_INC_FIREBIRD%" == "" set HB_INC_FIREBIRD=%HB_DIR_FIREBIRD%\include
set CFLAGS=-I"%HB_INC_FIREBIRD%"
set HB_DLL_NAME=fbclient
set HB_DLL_DIR=%FIREBIRD_DIR%\bin
set HB_DLL_DIR=%HB_DIR_FIREBIRD%\bin
rem ---------------------------------------------------------------
@@ -39,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 "%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 "%HB_DIR_FIREBIRD%\%HB_DLL_NAME%_ms.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%FREEIMAGE_DIR%" == "" goto DIR_OK
if not "%HB_DIR_FREEIMAGE%" == "" 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 set HB_DIR_FREEIMAGE=C:\FreeImage
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%FREEIMAGE_DIR%\source"
if "%HB_INC_FREEIMAGE%" == "" set HB_INC_FREEIMAGE=%HB_DIR_FREEIMAGE%\source
set CFLAGS=-I"%HB_INC_FREEIMAGE%"
set HB_DLL_NAME=FreeImage
set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
set HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist
rem ---------------------------------------------------------------

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${FREEIMAGE_INC}" == "" ]
if [ "${HB_INC_FREEIMAGE}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need FreeImage package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export FREEIMAGE_INC=C:/FreeImage/source"
echo " export HB_INC_FREEIMAGE=C:/FreeImage/source"
echo " or"
echo " export FREEIMAGE_INC=/usr/include/freeimage"
echo " export HB_INC_FREEIMAGE=/usr/include/freeimage"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${FREEIMAGE_INC}; do
for I in ${HB_INC_FREEIMAGE}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%FREEIMAGE_DIR%" == "" goto DIR_OK
if not "%HB_DIR_FREEIMAGE%" == "" 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 set HB_DIR_FREEIMAGE=C:\FreeImage
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%FREEIMAGE_DIR%\source"
if "%HB_INC_FREEIMAGE%" == "" set HB_INC_FREEIMAGE=%HB_DIR_FREEIMAGE%\source
set CFLAGS=-I"%HB_INC_FREEIMAGE%"
set HB_DLL_NAME=FreeImage
set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
set HB_DLL_DIR=%HB_DIR_FREEIMAGE%\Dist
rem ---------------------------------------------------------------

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%GD_DIR%" == "" goto DIR_OK
if not "%HB_DIR_GD%" == "" goto DIR_OK
echo ---------------------------------------------------------------
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 set HB_DIR_GD=-IC:\gd
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%GD_DIR%\include"
if "%HB_INC_GD%" == "" set HB_INC_GD=%HB_DIR_GD%\include
set CFLAGS=-I"%HB_INC_GD%"
set HB_DLL_NAME=bgd
set HB_DLL_DIR=%GD_DIR%\bin
set HB_DLL_DIR=%HB_DIR_GD%\bin
rem ---------------------------------------------------------------
@@ -58,4 +59,4 @@ if "%1" == "INSTALL" goto POST_INSTALL
set CFLAGS=
set HB_DLL_NAME=
set HB_DLL_DIR=
set HB_DLL_DIR=

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${GD_INC}" == "" ]
if [ "${HB_INC_GD}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need GD package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export GD_INC=c:/gd/include"
echo " export HB_INC_GD=c:/gd/include"
echo " or"
echo " export GD_INC=/usr/include/gd"
echo " export HB_INC_GD=/usr/include/gd"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=
for I in ${GD_INC}; do
for I in ${HB_INC_GD}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%GD_DIR%" == "" goto DIR_OK
if not "%HB_DIR_GD%" == "" goto DIR_OK
echo ---------------------------------------------------------------
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 set HB_DIR_GD=-IC:\gd
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%GD_DIR%\include"
if "%HB_INC_GD%" == "" set HB_INC_GD=%HB_DIR_GD%\include
set CFLAGS=-I"%HB_INC_GD%"
set HB_DLL_NAME=bgd
set HB_DLL_DIR=%GD_DIR%\bin
set HB_DLL_DIR=%HB_DIR_GD%\bin
rem ---------------------------------------------------------------
@@ -39,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 "%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 "%HB_DIR_GD%\lib\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%LIBHARU_DIR%" == "" goto DIR_OK
if not "%HB_DIR_LIBHARU%" == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need Haru Free PDF Library (libharu) DLL package
echo from www.libharu.org and this envvar to be set to
echo successfully build this library:
echo set LIBHARU_DIR=-IC:\libharu
echo set HB_DIR_LIBHARU=-IC:\libharu
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%LIBHARU_DIR%\include"
if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
set CFLAGS=-I"%HB_INC_LIBHARU%"
set HB_DLL_NAME=libhpdf
set HB_DLL_DIR=%LIBHARU_DIR%
set HB_DLL_DIR=%HB_DIR_LIBHARU%
rem ---------------------------------------------------------------
@@ -59,4 +60,4 @@ if "%1" == "INSTALL" goto POST_INSTALL
set CFLAGS=
set HB_DLL_NAME=
set HB_DLL_DIR=
set HB_DLL_DIR=

View File

@@ -4,21 +4,21 @@
# $Id$
#
if [ "${LIBHARU_INC}" == "" ]
if [ "${HB_INC_LIBHARU}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need Haru Free PDF Library (libharu) DLL
echo " package installed and this envvar to be set to"
echo " successfully build this library:"
echo " export LIBHARU_INC=C:/libharu/include"
echo " export HB_INC_LIBHARU=C:/libharu/include"
echo " or"
echo " export LIBHARU_INC=/usr/include/libharu"
echo " export HB_INC_LIBHARU=/usr/include/libharu"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=
for I in ${LIBHARU_INC}; do
for I in ${HB_INC_LIBHARU}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%LIBHARU_DIR%" == "" goto DIR_OK
if not "%HB_DIR_LIBHARU%" == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need Haru Free PDF Library (libharu) DLL package
echo from www.libharu.org and this envvar to be set to
echo successfully build this library:
echo set LIBHARU_DIR=-IC:\libharu
echo set HB_DIR_LIBHARU=-IC:\libharu
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%LIBHARU_DIR%\include"
if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
set CFLAGS=-I"%HB_INC_LIBHARU%"
set HB_DLL_NAME=libhpdf
set HB_DLL_DIR=%LIBHARU_DIR%
set HB_DLL_DIR=%HB_DIR_LIBHARU%
rem ---------------------------------------------------------------
@@ -40,7 +41,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 "%HB_DIR_LIBHARU%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%MYSQL_DIR%" == "" goto DIR_OK
if not "%HB_DIR_MYSQL%" == "" 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 set HB_DIR_MYSQL=C:\mysql
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%MYSQL_DIR%\include"
if "%HB_INC_MYSQL%" == "" set HB_INC_MYSQL=%HB_DIR_MYSQL%\include
set CFLAGS=-I"%HB_INC_MYSQL%"
set HB_DLL_NAME=libmySQL
set HB_DLL_DIR=%MYSQL_DIR%\bin
set HB_DLL_DIR=%HB_DIR_MYSQL%\bin
rem ---------------------------------------------------------------

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${MYSQL_INC}" == "" ]
if [ "${HB_INC_MYSQL}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need MYSQL package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export MYSQL_INC=C:/Mysql/include"
echo " export HB_INC_MYSQL=C:/Mysql/include"
echo " or"
echo " export MYSQL_INC=/usr/include/mysql"
echo " export HB_INC_MYSQL=/usr/include/mysql"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${MYSQL_INC}; do
for I in ${HB_INC_MYSQL}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,20 +3,21 @@ rem
rem $Id$
rem
if not "%MYSQL_DIR%" == "" goto DIR_OK
if not "%HB_DIR_MYSQL%" == "" 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 set HB_DIR_MYSQL=C:\mysql
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%MYSQL_DIR%\include" -D__WIN32__
if "%HB_INC_MYSQL%" == "" set HB_INC_MYSQL=%HB_DIR_MYSQL%\include
set CFLAGS=-I"%HB_INC_MYSQL%" -D__WIN32__
set HB_DLL_NAME=libmySQL
set HB_DLL_DIR=%MYSQL_DIR%\bin
set HB_DLL_DIR=%HB_DIR_MYSQL%\bin
rem ---------------------------------------------------------------
@@ -39,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 "%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 "%HB_DIR_MYSQL%\lib\opt\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%PGSQL_DIR%" == "" goto DIR_OK
if not "%HB_DIR_PGSQL%" == "" 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 set HB_DIR_PGSQL=C:\pgsql
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%PGSQL_DIR%\include"
if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
set CFLAGS=-I"%HB_INC_PGSQL%"
rem .exe
set HB_DLL_NAME=postgres
set HB_DLL_DIR=%PGSQL_DIR%\bin
set HB_DLL_DIR=%HB_DIR_PGSQL%\bin
rem ---------------------------------------------------------------

View File

@@ -4,20 +4,20 @@
# $Id$
#
if [ "${PGSQL_INC}" == "" ]
if [ "${HB_INC_PGSQL}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need PostgreSQL package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export PGSQL_INC=C:/Posgres/include"
echo " export HB_INC_PGSQL=C:/Posgres/include"
echo " or"
echo " export PGSQL_INC=/usr/include/postgres"
echo " export HB_INC_PGSQL=/usr/include/postgres"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${PGSQL_INC}; do
for I in ${HB_INC_PGSQL}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,21 +3,22 @@ rem
rem $Id$
rem
if not "%PGSQL_DIR%" == "" goto DIR_OK
if not "%HB_DIR_PGSQL%" == "" 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 set HB_DIR_PGSQL=C:\pgsql
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%PGSQL_DIR%\include"
if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
set CFLAGS=-I"%HB_INC_PGSQL%"
rem .exe
set HB_DLL_NAME=postgres
set HB_DLL_DIR=%PGSQL_DIR%\bin
set HB_DLL_DIR=%HB_DIR_PGSQL%\bin
rem ---------------------------------------------------------------

View File

@@ -46,14 +46,14 @@ set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbvpdf hbw32 hbwhat32 xhb
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
set _HB_DIRS=hbclipsm hbw32ddr
if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo
if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird
if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage
if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%ADS_DIR%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%LIBHARU_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo
if not "%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird
if not "%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage
if not "%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
rem *******************************************************

View File

@@ -48,14 +48,14 @@ case "$HB_ARCHITECTURE" in
_HB_DIRS_ADD=;;
esac
if [ "${APOLLO_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi;
if [ "${FIREBIRD_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird "; fi;
if [ "${FREEIMAGE_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfimage"; fi;
if [ "${GD_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbgd "; fi;
if [ "${MYSQL_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql "; fi;
if [ "${PGSQL_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql "; fi;
if [ "${ADS_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads "; fi;
if [ "${LIBHARU_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf "; fi;
if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi;
if [ "${HB_INC_FIREBIRD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird "; fi;
if [ "${HB_INC_FREEIMAGE}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfimage"; fi;
if [ "${HB_INC_GD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbgd "; fi;
if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql "; fi;
if [ "${HB_INC_PGSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql "; fi;
if [ "${HB_INC_ADS}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads "; fi;
if [ "${HB_INC_LIBHARU}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf "; fi;
_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD}"

View File

@@ -46,14 +46,14 @@ set _HB_DIRS=hbole hbziparch hbodbc hbtpathy hbtip hbvpdf hbw32 hbwhat32 xhb
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
set _HB_DIRS=hbclipsm hbw32ddr
if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo
if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird
if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage
if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%ADS_DIR%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%LIBHARU_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo
if not "%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird
if not "%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage
if not "%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %__BATWORKER__% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
rem *******************************************************

View File

@@ -3,22 +3,23 @@ rem
rem $Id$
rem
if not "%ADS_DIR%" == "" goto DIR_OK
if not "%HB_DIR_ADS%" == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need Advantage Client Engine (5.0 or upper)
echo and this envvar to be set to successfully build this library:
echo set ADS_DIR=C:\ads\acesdk
echo set HB_DIR_ADS=C:\ads\acesdk
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%ADS_DIR%"
if "%HB_INC_ADS%" == "" set HB_INC_ADS=%HB_DIR_ADS%
set CFLAGS=-I"%HB_INC_ADS%"
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
if exist "%HB_DIR_ADS%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\Redistribute
if exist "%HB_DIR_ADS%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%
if exist "%HB_DIR_ADS%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\32bit
echo Using this .dll: "%HB_DLL_DIR%\%HB_DLL_NAME%.dll"

View File

@@ -4,21 +4,21 @@
# $Id$
#
if [ "${ADS_INC}" == "" ]
if [ "${HB_INC_ADS}" == "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need Advantage Client Engine (5.0 or upper)"
echo " installed and this envvar to be set to successfully"
echo " build this library:"
echo " export ADS_INC=C:/ads/acesdk"
echo " export HB_INC_ADS=C:/ads/acesdk"
echo " or"
echo " export ADS_INC=/usr/include/ads"
echo " export HB_INC_ADS=/usr/include/ads"
echo "---------------------------------------------------------------"
exit 1
fi
export CFLAGS=""
for I in ${ADS_INC}; do
for I in ${HB_INC_ADS}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

View File

@@ -3,22 +3,23 @@ rem
rem $Id$
rem
if not "%ADS_DIR%" == "" goto DIR_OK
if not "%HB_DIR_ADS%" == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need Advantage Client Engine (5.0 or upper)
echo and this envvar to be set to successfully build this library:
echo set ADS_DIR=C:\ads\acesdk
echo set HB_DIR_ADS=C:\ads\acesdk
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%ADS_DIR%"
if "%HB_INC_ADS%" == "" set HB_INC_ADS=%HB_DIR_ADS%
set CFLAGS=-I"%HB_INC_ADS%"
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
if exist "%HB_DIR_ADS%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\Redistribute
if exist "%HB_DIR_ADS%\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%
if exist "%HB_DIR_ADS%\32bit\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%HB_DIR_ADS%\32bit
echo Using this .dll: "%HB_DLL_DIR%\%HB_DLL_NAME%.dll"
@@ -43,7 +44,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 "%HB_DIR_ADS%\%HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN