From 84396b7f48ff2ade5db13fae07398fd26378df3c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 Apr 2011 20:34:30 +0000 Subject: [PATCH] 2011-04-26 22:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/mpkg_win_nightly.bat + disabled bcc libs in nightly binary build. bcc is not tested by most developers anymore, so its risky to include it and let it break the build. * contrib/hbrun/hbrun.rc - Disable app icon for bcc builds. bcc is too old or buggy to handle .ico files with certain properties. * utils/hbmk2/hbmk2.prg - Disabled -icon= option for bcc to avoid build breaks due to more recent .ico files. * contrib/hbmlzo/hbmlzo.hbx * autoupdate ; NOTE: This was my last patch targeting a bcc specific problem. It's a waste of time. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/contrib/hbmlzo/hbmlzo.hbx | 3 ++- harbour/contrib/hbrun/hbrun.rc | 2 ++ harbour/package/mpkg_win_nightly.bat | 18 +++++++++--------- harbour/utils/hbmk2/hbmk2.prg | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bb039b72f8..54602c3163 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,26 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-26 22:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/mpkg_win_nightly.bat + + disabled bcc libs in nightly binary build. + bcc is not tested by most developers anymore, so its risky + to include it and let it break the build. + + * contrib/hbrun/hbrun.rc + - Disable app icon for bcc builds. bcc is too old or buggy + to handle .ico files with certain properties. + + * utils/hbmk2/hbmk2.prg + - Disabled -icon= option for bcc to avoid build breaks due + to more recent .ico files. + + * contrib/hbmlzo/hbmlzo.hbx + * autoupdate + + ; NOTE: This was my last patch targeting a bcc specific problem. + It's a waste of time. + 2011-04-26 18:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbnf/tests/ontick.prg - contrib/hbnf/ontick.c diff --git a/harbour/contrib/hbmlzo/hbmlzo.hbx b/harbour/contrib/hbmlzo/hbmlzo.hbx index 9b5716a6dd..d800cee9b9 100644 --- a/harbour/contrib/hbmlzo/hbmlzo.hbx +++ b/harbour/contrib/hbmlzo/hbmlzo.hbx @@ -25,9 +25,10 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC HB_LZO_COMPRESSBOUND DYNAMIC HB_LZO1X_1_COMPRESS DYNAMIC HB_LZO1X_DECOMPRESS +DYNAMIC HB_LZO1X_DECOMPRESS_SAFE +DYNAMIC HB_LZO_COMPRESSBOUND DYNAMIC LZO_ADLER32 DYNAMIC LZO_VERSION DYNAMIC LZO_VERSION_DATE diff --git a/harbour/contrib/hbrun/hbrun.rc b/harbour/contrib/hbrun/hbrun.rc index 5736f30121..9254c1f54b 100644 --- a/harbour/contrib/hbrun/hbrun.rc +++ b/harbour/contrib/hbrun/hbrun.rc @@ -5,7 +5,9 @@ #if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 ) ICON 1 DISCARDABLE "../../package/harb_os2.ico" #else +#if ! defined( __BORLANDC__ ) 1 ICON DISCARDABLE "../../package/harb_win.ico" +#endif #include "../../package/harb_win.rc" __HB_CREATEPROCESS_MANIFEST_RESOURCE_ID __HB_RT_MANIFEST "../../package/harb_win.mft" #endif diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index 373cb56f3e..f7b4681672 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -55,11 +55,11 @@ set _HB_SFNET_URL=,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/ha set HB_BUILD_PKG=yes set HB_DIR_NSIS=%_HB_DIR_TOOL%nsis\ -set HB_OPT_NSIS=/DPKG_NO_COMP_MSVC /DPKG_NO_COMP_MSVC64 /DPKG_NO_COMP_MINGW64 /DPKG_NO_COMP_MINGWARM /DPKG_NO_PLAT_LINUX /DPKG_NO_PLAT_OS2 /DPKG_NO_PLAT_DOS /DPKG_NO_COMP_WATCOM +set HB_OPT_NSIS=/DPKG_NO_COMP_BCC /DPKG_NO_COMP_MSVC /DPKG_NO_COMP_MSVC64 /DPKG_NO_COMP_MINGW64 /DPKG_NO_COMP_MINGWARM /DPKG_NO_PLAT_LINUX /DPKG_NO_PLAT_OS2 /DPKG_NO_PLAT_DOS /DPKG_NO_COMP_WATCOM set HB_DIR_ZIP=%_HB_DIR_TOOL% set HB_DIR_7Z=%_HB_DIR_TOOL% set HB_DIR_UPX=%_HB_DIR_TOOL%upx\ -set HB_DIR_BCC_IMPLIB=%_HB_DIR_COMP%bcc\Bin\ +rem set HB_DIR_BCC_IMPLIB=%_HB_DIR_COMP%bcc\Bin\ set HB_DIR_MINGW=%_HB_DIR_COMP%mingw set HB_WITH_ADS=%_HB_DIR_3RD%ads\acesdk @@ -85,12 +85,12 @@ win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-mingw-log.t if errorlevel 1 goto _EXIT endlocal -setlocal -echo ! Setting environment for using Borland C++ -set PATH=%_HB_DIR_COMP%bcc\Bin -win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc-log.txt" 2>&1 -if errorlevel 1 goto _EXIT -endlocal +rem setlocal +rem echo ! Setting environment for using Borland C++ +rem set PATH=%_HB_DIR_COMP%bcc\Bin +rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc-log.txt" 2>&1 +rem if errorlevel 1 goto _EXIT +rem endlocal rem setlocal rem echo ! Setting environment for using Open Watcom @@ -123,7 +123,7 @@ echo ! Uploading Harbour unified Windows package... %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-mingw-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% -%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-bcc-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-bcc-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-watcom-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% echo ! Finished. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 8a44f9387c..782cf80386 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5728,7 +5728,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cFile += '#endif' + Chr( 10 ) cFile += 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "' + PathSepToForward( hbmk[ _HBMK_cMANIFEST ] ) + '"' + Chr( 10 ) ENDIF - IF ! Empty( hbmk[ _HBMK_aICON ] ) + IF ! Empty( hbmk[ _HBMK_aICON ] ) .AND. !( hbmk[ _HBMK_cCOMP ] == "bcc" ) /* BCC cannot handle certain new .ico files */ IF hbmk[ _HBMK_cPLAT ] == "os2" AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + PathSepToForward( tmp ) + '"' + Chr( 10 ) } ) ELSE