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

2009-07-02 00:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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)
This commit is contained in:
Viktor Szakats
2009-07-01 22:36:28 +00:00
parent 86169c1272
commit 0b8fe0090a
22 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
harbour/ChangeLog
View File

@@ -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

5
harbour/contrib/Makefile
View File

@@ -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)

1
harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp
View File

@@ -352,3 +352,4 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SUBMIT )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qapplication.cpp
View File

@@ -814,3 +814,4 @@ HB_FUNC( QT_QAPPLICATION_SETSTYLESHEET )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qclipboard.cpp
View File

@@ -189,3 +189,4 @@ HB_FUNC( QT_QCLIPBOARD_TEXT )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qcoreapplication.cpp
View File

@@ -406,3 +406,4 @@ HB_FUNC( QT_QCOREAPPLICATION_QUIT )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qcursor.cpp
View File

@@ -155,3 +155,4 @@ HB_FUNC( QT_QCURSOR_SETPOS_1 )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qfont.cpp
View File

@@ -552,3 +552,4 @@ HB_FUNC( QT_QFONT_SUBSTITUTIONS )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qfontdatabase.cpp
View File

@@ -249,3 +249,4 @@ HB_FUNC( QT_QFONTDATABASE_WRITINGSYSTEMSAMPLE )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qimage.cpp
View File

@@ -578,3 +578,4 @@ HB_FUNC( QT_QIMAGE_WIDTH )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qimagereader.cpp
View File

@@ -392,3 +392,4 @@ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_2 )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qobject.cpp
View File

@@ -329,3 +329,4 @@ HB_FUNC( QT_QOBJECT_DELETELATER )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qtextcursor.cpp
View File

@@ -571,3 +571,4 @@ HB_FUNC( QT_QTEXTCURSOR_VISUALNAVIGATION )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qtextdocument.cpp
View File

@@ -616,3 +616,4 @@ HB_FUNC( QT_QTEXTDOCUMENT_UNDO_1 )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qtextframe.cpp
View File

@@ -142,3 +142,4 @@ HB_FUNC( QT_QTEXTFRAME_SETFRAMEFORMAT )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qurl.cpp
View File

@@ -652,3 +652,4 @@ HB_FUNC( QT_QURL_TOPERCENTENCODING )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

1
harbour/contrib/hbqt/hbqt_qvariant.cpp
View File

@@ -437,3 +437,4 @@ HB_FUNC( QT_QVARIANT_TYPETONAME )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp
View File

@@ -59,6 +59,7 @@
#if QT_VERSION >= 0x040500
/*----------------------------------------------------------------------*/
#include <qvariant.h>
#include <QtWebKit/QWebHistoryItem>
@@ -141,3 +142,4 @@ HB_FUNC( QT_QWEBHISTORYITEM_USERDATA )
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

2
harbour/examples/hbextern/hbextern.hbp
View File

@@ -3,7 +3,7 @@
#
-q0
-w2
-w3
-es2
-nulrdd

2
harbour/examples/hbextern/hbextern.prg
View File

@@ -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

4
harbour/source/rtl/hbzlibgz.c
View File

@@ -333,17 +333,17 @@ HB_FUNC( HB_GZEOF )
hb_retl( gzeof( gz ) != 0 );
}
#if ZLIB_VERNUM >= 0x1230
/*
* HB_GZDIRECT( <pGZipStream> ) => <lResult>
*/
HB_FUNC( HB_GZDIRECT )
{
#if ZLIB_VERNUM >= 0x1230
gzFile gz = hb_gzParam( 1 );
if( gz )
hb_retl( gzdirect( gz ) != 0 );
}
#endif
}
/*
* HB_GZERROR( <pGZipStream>, [ <@nError> ] ) => <cError>

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

@@ -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