diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6b729fa92b..a4a1e55a42 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,25 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-12 17:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_deb.sh + ! Applied patch to recent change to only accept + QT libs on or above version 4.5.0. + Patch submitted by Guy Roussin. + + * utils/hbmk2/hbmk2.prg + + Added ${hb_status} and ${hb_revision} macros which + will return Harbour version status and revision. + + * contrib/rddads/ads1.c + ! Fixed to allow EF_CANDEFAULT in EG_DATAWIDTH RTE when + trying to update field content. + + * examples/dbu/dbu52.dif + * examples/dbu/dbu53.dif + ! Fixed two more filename edit fields where uppercase was + forced. Thanks to Davor Siklic for the hint. + 2009-06-12 14:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * examples/superlib/readme.txt * examples/dbu/readme.txt diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 778f68d45d..8c6d21a3f8 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -147,8 +147,8 @@ static void adsSetSend( void ) } static HB_ERRCODE commonError( ADSAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, - USHORT uiOsCode, const char * szFileName, - USHORT uiFlags, PHB_ITEM * pErrorPtr ) + USHORT uiOsCode, const char * szFileName, + USHORT uiFlags, PHB_ITEM * pErrorPtr ) { PHB_ITEM pError; HB_ERRCODE errCode = HB_FAILURE; @@ -2530,7 +2530,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) else if( ulRetVal == AE_TABLE_READONLY ) commonError( pArea, EG_READONLY, EDBF_READONLY, 0, NULL, 0, NULL ); else if( ulRetVal == AE_DATA_TOO_LONG ) - commonError( pArea, EG_DATAWIDTH, EDBF_DATAWIDTH, 0, NULL, 0, NULL ); + return commonError( pArea, EG_DATAWIDTH, EDBF_DATAWIDTH, 0, NULL, EF_CANDEFAULT, NULL ); else commonError( pArea, EG_WRITE, ( USHORT ) ulRetVal, 0, NULL, 0, NULL ); return HB_FAILURE; diff --git a/harbour/examples/dbu/dbu52.dif b/harbour/examples/dbu/dbu52.dif index f5801b623a..cf49c5dbe6 100644 --- a/harbour/examples/dbu/dbu52.dif +++ b/harbour/examples/dbu/dbu52.dif @@ -156,7 +156,16 @@ diff -u dbu52ori/dbustru.prg dbu52pat/dbustru.prg diff -u dbu52ori/dbuutil.prg dbu52pat/dbuutil.prg --- dbu52ori/dbuutil.prg 1993-03-04 04:20:00.000000000 +0100 -+++ dbu52pat/dbuutil.prg 2009-06-10 01:37:40.000000000 +0200 ++++ dbu52pat/dbuutil.prg 2009-06-12 17:43:43.000000000 +0200 +@@ -950,7 +950,7 @@ + SET KEY 24 TO clear_gets + + * call entry in place function +- name_temp = enter_rc(M->filename,M->irow,M->wl+9,64,"@K!S20",M->color9) ++ name_temp = enter_rc(M->filename,M->irow,M->wl+9,64,"@KS20",M->color9) + + * release down arrow + SET KEY 24 TO @@ -2152,7 +2152,7 @@ IF FILE(M->filename) * only if the file exists diff --git a/harbour/examples/dbu/dbu53.dif b/harbour/examples/dbu/dbu53.dif index 73f1bf8d52..36d3fb8386 100644 --- a/harbour/examples/dbu/dbu53.dif +++ b/harbour/examples/dbu/dbu53.dif @@ -207,7 +207,16 @@ diff -u dbu53ori/dbustru.prg dbu53pat/dbustru.prg diff -u dbu53ori/dbuutil.prg dbu53pat/dbuutil.prg --- dbu53ori/dbuutil.prg 1996-05-20 05:31:00.000000000 +0200 -+++ dbu53pat/dbuutil.prg 2009-06-10 01:02:54.000000000 +0200 ++++ dbu53pat/dbuutil.prg 2009-06-12 17:41:51.000000000 +0200 +@@ -950,7 +950,7 @@ + SET KEY 24 TO clear_gets + + * call entry in place function +- name_temp = enter_rc(M->filename,M->irow,M->wl+9,64,"@K!S20",M->color9) ++ name_temp = enter_rc(M->filename,M->irow,M->wl+9,64,"@KS20",M->color9) + + * release down arrow + SET KEY 24 TO @@ -2152,7 +2152,7 @@ IF FILE(M->filename) * only if the file exists diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh index 84ee666cd2..f2e9e866cd 100755 --- a/harbour/mpkg_deb.sh +++ b/harbour/mpkg_deb.sh @@ -14,6 +14,13 @@ test_reqpkg() { dpkg -l "$1" 2> /dev/null | grep '^ii' &> /dev/null + status="$?" + if [ -n "$2" ] && [ $status -eq 0 ] + then + dpkg --compare-versions `dpkg -s "$1" 2> /dev/null | grep "^Version:" | cut -d' ' -f2` ge $2 + status="$?" + fi + return "$status" } TOINST_LST="" @@ -106,7 +113,7 @@ then export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbpgsql" fi -if test_reqpkg libqt4-dev +if test_reqpkg libqt4-dev "4.5.0" then export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbqt" fi diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 734d87068d..903023cadb 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5181,6 +5181,10 @@ STATIC FUNCTION MacroProc( hbmk, cString, cDirParent ) cMacro := hb_ntos( hb_Version( HB_VERSION_MINOR ) ) CASE cMacro == "HB_RELEASE" cMacro := hb_ntos( hb_Version( HB_VERSION_RELEASE ) ) + CASE cMacro == "HB_STATUS" + cMacro := hb_Version( HB_VERSION_STATUS ) + CASE cMacro == "HB_REVISION" + cMacro := hb_ntos( hb_Version( HB_VERSION_REVISION ) ) CASE cMacro == "HB_BIN" cMacro := hbmk[ _HBMK_cHB_BIN_INSTALL ] CASE cMacro == "HB_LIB"