diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 246b3c8a01..f9340ef145 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-14 10:46 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbfbird/make_b32.bat + * contrib/hbfbird/make_vc.bat + * contrib/hbfimage/make_vc.bat + * contrib/hbgd/make_vc.bat + * contrib/hbmysql/make_vc.bat + * contrib/hbzlib/make_vc.bat + * contrib/rddads/make_vc.bat + + Use .lib files supplied with 3rd party packages + (where available), rather than generating them locally. + ; Please test. + 2008-05-14 10:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/tbrowse.prg ! fixed :insColumn() - added missing hb_aIns() parameter. diff --git a/harbour/contrib/hbfbird/make_b32.bat b/harbour/contrib/hbfbird/make_b32.bat index 03e4f4e92a..a595f5b9bb 100644 --- a/harbour/contrib/hbfbird/make_b32.bat +++ b/harbour/contrib/hbfbird/make_b32.bat @@ -38,7 +38,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbfbird/make_vc.bat b/harbour/contrib/hbfbird/make_vc.bat index 6eead3fa5e..a9f2bad0e1 100644 --- a/harbour/contrib/hbfbird/make_vc.bat +++ b/harbour/contrib/hbfbird/make_vc.bat @@ -38,23 +38,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbfimage/make_vc.bat b/harbour/contrib/hbfimage/make_vc.bat index eed0019c80..430c2de69d 100644 --- a/harbour/contrib/hbfimage/make_vc.bat +++ b/harbour/contrib/hbfimage/make_vc.bat @@ -39,23 +39,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbgd/make_vc.bat b/harbour/contrib/hbgd/make_vc.bat index 83423b8887..92752605bc 100644 --- a/harbour/contrib/hbgd/make_vc.bat +++ b/harbour/contrib/hbgd/make_vc.bat @@ -38,23 +38,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbmysql/make_vc.bat b/harbour/contrib/hbmysql/make_vc.bat index 4a72b6853c..40187bc46a 100644 --- a/harbour/contrib/hbmysql/make_vc.bat +++ b/harbour/contrib/hbmysql/make_vc.bat @@ -38,23 +38,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index 0038e1409c..1f3202b147 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -38,23 +38,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/rddads/make_vc.bat b/harbour/contrib/rddads/make_vc.bat index 525a977590..c99c33ebe9 100644 --- a/harbour/contrib/rddads/make_vc.bat +++ b/harbour/contrib/rddads/make_vc.bat @@ -42,23 +42,8 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - rem --------------------------------------------------------------- - rem This .dll to .lib conversion needs GNU sed.exe in the path - rem --------------------------------------------------------------- - echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed - echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed - 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 - 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 - del _dump.tmp - del _temp.def - del _temp.sed - rem --------------------------------------------------------------- + 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 goto POST_EXIT :POST_CLEAN