diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6cac8a9218..96f86e03d1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,7 +17,58 @@ past entries belonging to author(s): Viktor Szakats. */ -2009-07-01 20:52 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) +2009-07-02 00:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/Makefile + * Moved hbxbp to the end of list as a workaround for potentially + outdated hbqt.ch reference, if it's before hbqt build. + Still not prefect though. We should probably fix the ordering + of -I option in build process, but it doesn't seem trivial. + Or avoid installing headers into central include dir, but that + also leads far. + + * utils/hbmk2/hbmk2.prg + * Minor step to fix a recent regression. + + * source/rtl/hbzlibgz.c + * HB_GZDIRECT() is now always defined in core, if it's built against + older zlib version, it will simply do nothing. + We can discuss how to handle this situation, all have pros and cons: + 1) Always define: Throw RTE at runtime. + 2) Always define: Return error at runtime. + 3) Don't define if low-level wrapper isn't present. Makes it + easy to catch missing dependencies on .prg level, but it + break Harbour to provide a consistent higher level API. + + * examples/hbextern/hbextern.prg + ! Minor fix in generated comment. + + * examples/hbextern/hbextern.hbp + + -w2 -> -w3 + + * ChangeLog + ! Wrong header in previous entry. + + * contrib/hbqt/hbqt_qimage.cpp + * contrib/hbqt/hbqt_qtextdocument.cpp + * contrib/hbqt/hbqt_qapplication.cpp + * contrib/hbqt/hbqt_qtextcursor.cpp + * contrib/hbqt/hbqt_qclipboard.cpp + * contrib/hbqt/hbqt_qurl.cpp + * contrib/hbqt/hbqt_qwebhistoryitem.cpp + * contrib/hbqt/hbqt_qvariant.cpp + * contrib/hbqt/hbqt_qfont.cpp + * contrib/hbqt/hbqt_qimagereader.cpp + * contrib/hbqt/hbqt_qcursor.cpp + * contrib/hbqt/hbqt_qfontdatabase.cpp + * contrib/hbqt/hbqt_qcoreapplication.cpp + * contrib/hbqt/hbqt_qobject.cpp + * contrib/hbqt/hbqt_qtextframe.cpp + * contrib/hbqt/hbqt_qabstractitemmodel.cpp + * Minor EOF change after regerenating them with hbqtgen. + (probably it would be better to generate only one EOLs at + EOF by hbqtgen) + +2009-07-01 20:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt.h * contrib/hbqt/hbqt_qabstractitemmodel.cpp * contrib/hbqt/hbqt_qapplication.cpp diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 01fa0888af..246053c8ea 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -25,7 +25,6 @@ DIRS=\ hbtpathy \ hbvpdf \ hbwin \ - hbxbp \ hbziparc \ rddado \ xhb \ @@ -47,6 +46,10 @@ DIRS +=\ rddads \ rddsql \ +# contribs dependent on above +DIRS +=\ + hbxbp \ + else ifneq ($(HB_CONTRIBLIBS),no) diff --git a/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp b/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp index f6ffd65f63..45d1a8b71a 100644 --- a/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp +++ b/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp @@ -352,3 +352,4 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SUBMIT ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qapplication.cpp b/harbour/contrib/hbqt/hbqt_qapplication.cpp index 22f825fa97..a059b57ac9 100644 --- a/harbour/contrib/hbqt/hbqt_qapplication.cpp +++ b/harbour/contrib/hbqt/hbqt_qapplication.cpp @@ -814,3 +814,4 @@ HB_FUNC( QT_QAPPLICATION_SETSTYLESHEET ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qclipboard.cpp b/harbour/contrib/hbqt/hbqt_qclipboard.cpp index 5d1cd87706..ef6904221d 100644 --- a/harbour/contrib/hbqt/hbqt_qclipboard.cpp +++ b/harbour/contrib/hbqt/hbqt_qclipboard.cpp @@ -189,3 +189,4 @@ HB_FUNC( QT_QCLIPBOARD_TEXT ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qcoreapplication.cpp b/harbour/contrib/hbqt/hbqt_qcoreapplication.cpp index b34125d8bd..278b0e6206 100644 --- a/harbour/contrib/hbqt/hbqt_qcoreapplication.cpp +++ b/harbour/contrib/hbqt/hbqt_qcoreapplication.cpp @@ -406,3 +406,4 @@ HB_FUNC( QT_QCOREAPPLICATION_QUIT ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qcursor.cpp b/harbour/contrib/hbqt/hbqt_qcursor.cpp index 4bd1aae495..08de69f190 100644 --- a/harbour/contrib/hbqt/hbqt_qcursor.cpp +++ b/harbour/contrib/hbqt/hbqt_qcursor.cpp @@ -155,3 +155,4 @@ HB_FUNC( QT_QCURSOR_SETPOS_1 ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qfont.cpp b/harbour/contrib/hbqt/hbqt_qfont.cpp index 8372816f5c..f6c8014b58 100644 --- a/harbour/contrib/hbqt/hbqt_qfont.cpp +++ b/harbour/contrib/hbqt/hbqt_qfont.cpp @@ -552,3 +552,4 @@ HB_FUNC( QT_QFONT_SUBSTITUTIONS ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qfontdatabase.cpp b/harbour/contrib/hbqt/hbqt_qfontdatabase.cpp index 29dd13c2fa..1646e5cd11 100644 --- a/harbour/contrib/hbqt/hbqt_qfontdatabase.cpp +++ b/harbour/contrib/hbqt/hbqt_qfontdatabase.cpp @@ -249,3 +249,4 @@ HB_FUNC( QT_QFONTDATABASE_WRITINGSYSTEMSAMPLE ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qimage.cpp b/harbour/contrib/hbqt/hbqt_qimage.cpp index d77978a79d..7b9b3d8f70 100644 --- a/harbour/contrib/hbqt/hbqt_qimage.cpp +++ b/harbour/contrib/hbqt/hbqt_qimage.cpp @@ -578,3 +578,4 @@ HB_FUNC( QT_QIMAGE_WIDTH ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qimagereader.cpp b/harbour/contrib/hbqt/hbqt_qimagereader.cpp index 4245f80106..6ad47357c0 100644 --- a/harbour/contrib/hbqt/hbqt_qimagereader.cpp +++ b/harbour/contrib/hbqt/hbqt_qimagereader.cpp @@ -392,3 +392,4 @@ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_2 ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qobject.cpp b/harbour/contrib/hbqt/hbqt_qobject.cpp index a89fb8367f..a976e8ef1a 100644 --- a/harbour/contrib/hbqt/hbqt_qobject.cpp +++ b/harbour/contrib/hbqt/hbqt_qobject.cpp @@ -329,3 +329,4 @@ HB_FUNC( QT_QOBJECT_DELETELATER ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp b/harbour/contrib/hbqt/hbqt_qtextcursor.cpp index 04b46f3b2b..ff295f2781 100644 --- a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextcursor.cpp @@ -571,3 +571,4 @@ HB_FUNC( QT_QTEXTCURSOR_VISUALNAVIGATION ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp b/harbour/contrib/hbqt/hbqt_qtextdocument.cpp index 08f91fb615..154fe451a4 100644 --- a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextdocument.cpp @@ -616,3 +616,4 @@ HB_FUNC( QT_QTEXTDOCUMENT_UNDO_1 ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qtextframe.cpp b/harbour/contrib/hbqt/hbqt_qtextframe.cpp index 1bb5928e35..1212353ecb 100644 --- a/harbour/contrib/hbqt/hbqt_qtextframe.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextframe.cpp @@ -142,3 +142,4 @@ HB_FUNC( QT_QTEXTFRAME_SETFRAMEFORMAT ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qurl.cpp b/harbour/contrib/hbqt/hbqt_qurl.cpp index 7892c18b1c..d688cec183 100644 --- a/harbour/contrib/hbqt/hbqt_qurl.cpp +++ b/harbour/contrib/hbqt/hbqt_qurl.cpp @@ -652,3 +652,4 @@ HB_FUNC( QT_QURL_TOPERCENTENCODING ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qvariant.cpp b/harbour/contrib/hbqt/hbqt_qvariant.cpp index b8e850f6e5..86d29eef17 100644 --- a/harbour/contrib/hbqt/hbqt_qvariant.cpp +++ b/harbour/contrib/hbqt/hbqt_qvariant.cpp @@ -437,3 +437,4 @@ HB_FUNC( QT_QVARIANT_TYPETONAME ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp b/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp index 2fd035eb81..32efa9b310 100644 --- a/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp +++ b/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp @@ -59,6 +59,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ + #include #include @@ -141,3 +142,4 @@ HB_FUNC( QT_QWEBHISTORYITEM_USERDATA ) /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ + diff --git a/harbour/examples/hbextern/hbextern.hbp b/harbour/examples/hbextern/hbextern.hbp index 8b1b11dd81..be94c68e32 100644 --- a/harbour/examples/hbextern/hbextern.hbp +++ b/harbour/examples/hbextern/hbextern.hbp @@ -3,7 +3,7 @@ # -q0 --w2 +-w3 -es2 -nulrdd diff --git a/harbour/examples/hbextern/hbextern.prg b/harbour/examples/hbextern/hbextern.prg index 9be95d89ac..cbd966af43 100644 --- a/harbour/examples/hbextern/hbextern.prg +++ b/harbour/examples/hbextern/hbextern.prg @@ -346,7 +346,7 @@ PROCEDURE MAIN( ... ) FWrite( nOutput, EOL ) NEXT ENDIF - FWrite( nOutput, Stuff( ao[ capt_Desc ], 3, 0, "End of") + EOL + EOL ) + FWrite( nOutput, Stuff( ao[ capt_Desc ], 4, 0, "End of ") + EOL + EOL ) ENDIF NEXT diff --git a/harbour/source/rtl/hbzlibgz.c b/harbour/source/rtl/hbzlibgz.c index b65f45656c..4475ea5d61 100644 --- a/harbour/source/rtl/hbzlibgz.c +++ b/harbour/source/rtl/hbzlibgz.c @@ -333,17 +333,17 @@ HB_FUNC( HB_GZEOF ) hb_retl( gzeof( gz ) != 0 ); } -#if ZLIB_VERNUM >= 0x1230 /* * HB_GZDIRECT( ) => */ HB_FUNC( HB_GZDIRECT ) { +#if ZLIB_VERNUM >= 0x1230 gzFile gz = hb_gzParam( 1 ); if( gz ) hb_retl( gzdirect( gz ) != 0 ); -} #endif +} /* * HB_GZERROR( , [ <@nError> ] ) => diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a508199958..18f0996358 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3388,10 +3388,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) /* Merge lib lists. */ l_aLIBRAW := ArrayAJoin( { hbmk[ _HBMK_aLIBUSER ], l_aLIBHB, l_aLIB3RD, l_aLIBSYS } ) /* Dress lib names. */ - l_aLIB := ListCookLib( hbmk, l_aLIBRAW, cLibExt ) + l_aLIB := ListCookLib( hbmk, l_aLIBRAW, NIL, cLibExt ) IF hbmk[ _HBMK_lSHARED ] .AND. ! Empty( l_aLIBSHARED ) l_aLIBRAW := ArrayJoin( l_aLIBSHARED, l_aLIBRAW ) - l_aLIB := ArrayJoin( ListCookLib( hbmk, l_aLIBSHARED ), l_aLIB ) + l_aLIB := ArrayJoin( ListCookLib( hbmk, l_aLIBSHARED, NIL ), l_aLIB ) ENDIF /* Dress obj names. */ l_aOBJ := ListDirExt( ArrayJoin( hbmk[ _HBMK_aPRG ], hbmk[ _HBMK_aC ] ), cWorkDir, cObjExt ) @@ -4552,7 +4552,7 @@ STATIC FUNCTION ListDirExt( arraySrc, cDirNew, cExtNew ) RETURN array /* Forms the list of libs as to appear on the command line */ -STATIC FUNCTION ListCookLib( hbmk, arraySrc, cExtNew ) +STATIC FUNCTION ListCookLib( hbmk, arraySrc, cPrefix, cExtNew ) LOCAL array := AClone( arraySrc ) LOCAL cDir LOCAL cLibName @@ -4567,6 +4567,9 @@ STATIC FUNCTION ListCookLib( hbmk, arraySrc, cExtNew ) cLibName := SubStr( cLibName, 4 ) ENDIF #endif + IF cPrefix != NIL + cLibName := cPrefix + cLibName + ENDIF IF cExtNew != NIL cLibName := FN_ExtSet( cLibName, cExtNew ) ENDIF