From 2e7a94a8142a3a9eebb33415fc0949cb6e5ac1bb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 26 Dec 2009 11:18:25 +0000 Subject: [PATCH] 2009-12-26 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added note that at least QT 4.5.0 is required for Harbour. [TOMERGE 2.0] * package/winuni/mpkg_win_uni_extra_copy.bat + Copying full source of hbide to Windows binary release. ; TODO: Probably it'd be better to move this tool to examples to avoid such exceptions. [TOMERGE 2.0] * package/winuni/RELNOTES + Added link to sf.net files. * Next Windows binary release to not include HBQT libs built against static QT libs. [TOMERGE 2.0] * contrib/hbwin/mapi.c ! Minor correction / optimization. [TOMERGE 2.0] --- harbour/ChangeLog | 33 +++++++++++++++---- harbour/INSTALL | 2 +- harbour/contrib/hbwin/mapi.c | 17 ++++++---- harbour/package/winuni/RELNOTES | 16 +++++++-- .../winuni/mpkg_win_uni_extra_copy.bat | 2 ++ 5 files changed, 55 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7709342bce..bd681d0639 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,27 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-26 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added note that at least QT 4.5.0 is required for Harbour. + [TOMERGE 2.0] + + * package/winuni/mpkg_win_uni_extra_copy.bat + + Copying full source of hbide to Windows binary release. + ; TODO: Probably it'd be better to move this tool to examples to + avoid such exceptions. + [TOMERGE 2.0] + + * package/winuni/RELNOTES + + Added link to sf.net files. + * Next Windows binary release to not include HBQT libs + built against static QT libs. + [TOMERGE 2.0] + + * contrib/hbwin/mapi.c + ! Minor correction / optimization. + [TOMERGE 2.0] + 2009-12-24 18:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.prg * contrib/hbide/ideactions.prg @@ -49,18 +70,18 @@ + Added HbXbp_SetCodec( cCodec ) This function takes as parameter the Qt's codec (codepage) name and set it for conversion of CStrings automatically. - NOTE: This is an attempt to introduce CodePage concept in - HBQT but, because I am not conversant with codepage + NOTE: This is an attempt to introduce CodePage concept in + HBQT but, because I am not conversant with codepage terminology and usage, it is a shot in the dark. - Please test. I will try to hook a menu option to + Please test. I will try to hook a menu option to select a codec to hook into HBIDE. * contrib/hbide/resources/mainwindow.ui * contrib/hbide/idestylesheets.prg * contrib/hbide/hbide.prg - + Implemented resizable docking widgets to hold , - , , . - This has rendered HBIDE very flexible and expandable + + Implemented resizable docking widgets to hold , + , , . + This has rendered HBIDE very flexible and expandable with futuristic elements. 2009-12-23 22:26 UTC+0500 April White (april users.sourceforge.net) diff --git a/harbour/INSTALL b/harbour/INSTALL index 5c69a36ceb..8e67439414 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -314,7 +314,7 @@ HARBOUR HB_WITH_PCRE=C:\pcre (defaults to locally hosted version if not found) HB_WITH_PGSQL=C:\pgsql\include HB_WITH_PNG=C:\libpng (defaults to locally hosted version if not found) - HB_WITH_QT=C:\Qt\include + HB_WITH_QT=C:\Qt\include (version 4.5.0 or upper is required) HB_WITH_SLANG= (on *nix systems) HB_WITH_SQLITE3=C:\sqlite3 (defaults to locally hosted version if not found) HB_WITH_WATT= (on MS-DOS systems) diff --git a/harbour/contrib/hbwin/mapi.c b/harbour/contrib/hbwin/mapi.c index 4df6fb9642..a371cb7d33 100644 --- a/harbour/contrib/hbwin/mapi.c +++ b/harbour/contrib/hbwin/mapi.c @@ -111,13 +111,18 @@ HB_FUNC( WIN_MAPISENDMAIL ) note.lpszNoteText = ( LPSTR ) HB_PARSTR( 2, &hString[ iString++ ], NULL ); note.lpszMessageType = ( LPSTR ) HB_PARSTR( 3, &hString[ iString++ ], NULL ); note.lpszDateReceived = ( LPSTR ) HB_PARSTRDEF( 4, &hString[ iString++ ], NULL ); - note.lpRecips = nRecpCount > 0 ? ( MapiRecipDesc * ) hb_xgrab( nRecpCount * sizeof( MapiRecipDesc ) ) : NULL; - note.lpFiles = nFileCount > 0 ? ( MapiFileDesc * ) hb_xgrab( nFileCount * sizeof( MapiFileDesc ) ) : NULL; - note.nFileCount = 0; - note.nRecipCount = 0; - memset( note.lpRecips, 0, nRecpCount * sizeof( MapiRecipDesc ) ); - memset( note.lpFiles , 0, nFileCount * sizeof( MapiFileDesc ) ); + if( nRecpCount ) + { + note.lpRecips = ( MapiRecipDesc * ) hb_xgrab( nRecpCount * sizeof( MapiRecipDesc ) ); + memset( note.lpRecips, 0, nRecpCount * sizeof( MapiRecipDesc ) ); + } + + if( nFileCount ) + { + note.lpFiles = ( MapiFileDesc * ) hb_xgrab( nFileCount * sizeof( MapiFileDesc ) ); + memset( note.lpFiles , 0, nFileCount * sizeof( MapiFileDesc ) ); + } if( hb_parl( 6 ) ) note.flFlags |= MAPI_RECEIPT_REQUESTED; diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index a4a029292a..b3857c0e42 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -1,10 +1,13 @@ Hi All, -Harbour 2.0.0 (r13372) source archives and Windows binary -releases are available for download on sourceforge.net. +Harbour 2.x (r?????) source archives and Windows binary +releases are available for download on sourceforge.net: + + http://sourceforge.net/projects/harbour-project/files/ Make sure to check INSTALL doc "QUICK START" section and visit our user forums at: + http://sourceforge.net/apps/phpbb/harbour-project/ Release notes: @@ -65,6 +68,15 @@ Tool/lib versions used to create this package: QT 4.5.3 WATTCP 2.2.10 +Changes since previous (2.0.0) release: +----------------------------------------------------------------------- + +- HBQT libs built against static QT libs are not part anymore + of default Harbour binary package. Such libs can only be useful + for users who obtained commercial license for QT, which means + for majority of users, it isn't. It can easily be built from + source though. + Changes since previous (2.0.0beta3 20090905) release: ----------------------------------------------------------------------- diff --git a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat index ef38a02391..021a28e4e3 100644 --- a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat +++ b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat @@ -19,6 +19,8 @@ xcopy /y HARBOUR_README_MINGWARM xcopy /y HARBOUR_README_POCC F:\hb\hb20\comp\pocc\ xcopy /y HARBOUR_README_WATCOM F:\hb\hb20\comp\watcom\ +xcopy /y /s ..\..\contrib\hbide\*.* F:\hb\hb20\contrib\hbide\ + xcopy /y /s ..\..\pkg\win\mingw\harbour-2.0.0-win-mingw F:\hb\hb20\ xcopy /y /s ..\..\pkg\linux\watcom\harbour-2.0.0-linux-watcom\lib F:\hb\hb20\lib\linux\watcom\