fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-09-06 03:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed to not apply compression in -hbcmp (and similar) modes.
    ! Adjusted rdd lib ordering to make some linkers (mingw) happy without
      using lib grouping. Please review.

  * bin/hb-mkimp.bat
    * Little formatting.
This commit is contained in:
Viktor Szakats
2009-09-06 01:10:09 +00:00
parent a19b707412
commit cfb9c7ca6c
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-06 03:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed to not apply compression in -hbcmp (and similar) modes.
! Adjusted rdd lib ordering to make some linkers (mingw) happy without
using lib grouping. Please review.
* bin/hb-mkimp.bat
* Little formatting.
2009-09-06 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbtip/hbtipssl.hbc
! Fixed typo in lib name.

26
harbour/bin/hb-mkimp.bat
View File

@@ -42,10 +42,10 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll"
if exist "%HB_DIR_MYSQL%\bin\libmySQL.dll" implib "%HB_LIB_INSTALL%\libmysql.lib" "%HB_DIR_MYSQL%\bin\libmySQL.dll"
if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\out32dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll"
if exist "%HB_DIR_OPENSSL%\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\ssleay32.dll"
if exist "%HB_DIR_PGSQL%\lib\libpq.dll" implib -a "%HB_LIB_INSTALL%\libpq.lib" "%HB_DIR_PGSQL%\lib\libpq.dll"
@@ -69,12 +69,12 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib"
if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib"
if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_PGSQL%\bin\libpq.dll" call :P_MSVC_IMPLIB x86 "%HB_DIR_PGSQL%\bin\libpq.dll" "%HB_LIB_INSTALL%\libpq.lib"
if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib"
@@ -108,12 +108,12 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\liblibhpdf.a"
if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a"
if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a"
if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\liblibpq.a"
if exist "%HB_DIR_QT%\lib\libQtCore4.a" copy /b /y "%HB_DIR_QT%\lib\libQtCore4.a" "%HB_LIB_INSTALL%\libQtCore4.a"
@@ -151,12 +151,12 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib"
if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib"
if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib"
if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib"
if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib"
@@ -180,10 +180,10 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll"
if exist "%HB_DIR_MYSQL%\bin\libmySQL.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libmySQL.lib" "%HB_DIR_MYSQL%\bin\libmySQL.dll"
if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\out32dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll"
if exist "%HB_DIR_OPENSSL%\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll"
if exist "%HB_DIR_OPENSSL%\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\ssleay32.dll"
if exist "%HB_DIR_PGSQL%\lib\libpq.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libpq.lib" "%HB_DIR_PGSQL%\lib\libpq.dll"

11
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -753,10 +753,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
aLIB_BASE_2_MT := iif( hbmk[ _HBMK_nHBMODE ] != _HBMODE_HB10, { "hbrtl", "hbvmmt" }, aLIB_BASE_2 )
aLIB_BASE_GT := { "gtcgi", "gtpca", "gtstd" }
aLIB_BASE_NULRDD := { "hbnulrdd" }
aLIB_BASE_RDD := { "hbrdd", "hbusrrdd", "hbhsx", "hbsix", "rddntx", "rddcdx", "rddfpt" }
IF hbmk[ _HBMK_nHBMODE ] != _HBMODE_HB10 /* These libs have been added after 1.0.x */
AAdd( aLIB_BASE_RDD, "hbuddall" )
AAdd( aLIB_BASE_RDD, "rddnsx" )
IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_HB10
aLIB_BASE_RDD := { "hbusrrdd", "rddntx", "rddcdx", "rddfpt", "hbrdd", "hbhsx", "hbsix" }
ELSE
aLIB_BASE_RDD := { "hbuddall", "hbusrrdd", "rddntx", "rddcdx", "rddnsx", "rddfpt", "hbrdd", "hbhsx", "hbsix" }
ENDIF
aLIB_BASE_RDD_MT := aLIB_BASE_RDD
aLIB_BASE_CPLR := { "hbcplr" }
@@ -3998,7 +3998,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
DirUnbuild( cWorkDir )
ENDIF
IF nErrorLevel == 0 .AND. ! l_lCLEAN .AND. ! lTargetUpToDate
IF nErrorLevel == 0 .AND. ! l_lCLEAN .AND. ! lTargetUpToDate .AND. ;
( ! lStopAfterCComp .OR. lCreateLib .OR. lCreateDyn )
IF ! Empty( cBin_Post )