From 3c4c8c85a58aea2e3dc4c7dc774c919ff35fb567 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 25 Feb 2009 13:37:13 +0000 Subject: [PATCH] 2009-02-25 14:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.sh ! Fixed hb_mkslib link generation. * contrib/gtwvg/wvgwin.c ! Fixed owatcom error. (removed Windows structure redefinition) * utils/hbmk2/hbmk2.prg * Some screen messages slightly refined. * doc/whatsnew.txt * Minor. * ChangeLog * Fixed dates. --- harbour/ChangeLog | 22 +++++++++++++++++----- harbour/bin/postinst.sh | 2 +- harbour/contrib/gtwvg/wvgwin.c | 16 ---------------- harbour/doc/whatsnew.txt | 2 +- harbour/utils/hbmk2/hbmk2.prg | 14 +++++++------- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e83c6b20fc..2d8a84cd1d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,11 +8,23 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-25 14:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * bin/postinst.sh + ! Fixed hb_mkslib link generation. + * contrib/gtwvg/wvgwin.c + ! Fixed owatcom error. (removed Windows structure redefinition) + * utils/hbmk2/hbmk2.prg + * Some screen messages slightly refined. + * doc/whatsnew.txt + * Minor. + * ChangeLog + * Fixed dates. + 2009-02-25 13:54 UTC+0100 Miguel Angel Marchuet * contrib/hbbmcdx/bmdbfcdx.c ! updated to current rdd subsystem. -2009-02-24 13:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) +2009-02-25 13:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL + Added MinGW + msys specific entry. @@ -29,7 +41,7 @@ ! Fixed forward slashed to backslashes. * Changed default compiler from mingw to msvc. -2009-02-24 11:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu) +2009-02-25 11:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Refined autodetection of msvc to not be confused by watcom binary dir in the path. @@ -38,19 +50,19 @@ % Removed hack to not prioritize MSVC compiler detection, so it's now handled just like the others. -2009-02-24 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu) +2009-02-25 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + INSTALL + Installation docs kept simple. ; TODO: Add it to install packages. Test and extend as needed. -2009-02-24 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar hu) +2009-02-25 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.bat + Added dos/windows (djgpp/mingw) autodetection. ! Cleaned help screen. (missed from previous entry) * Other minor cleanups and fixes on help screen. -2009-02-24 10:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu) +2009-02-25 10:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.cmd * bin/postinst.bat * bin/hb-func.sh diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index d07167f448..f1e96cdcf0 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -88,7 +88,7 @@ then if [ -n "${hb_mkdyn}" ] && [ -f "${hb_mkdyn}" ]; then hb_mkdyn="${hb_mkdyn//-mkdyn/-mkslib}" rm -f "${hb_mkdyn}" - ln -s hb-mkdyn "${hb_mkdyn}" + ln -s "${hb_root}/bin/hb-mkdyn.sh" "${hb_mkdyn}" fi if [ "$HB_COMPILER" = "mingw" ]; then diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index a09cb566ee..7773161057 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -1592,22 +1592,6 @@ HB_FUNC( WVG_TREEVIEW_GETSELECTIONINFO ) // HB_FUNC( WVG_TREEVIEW_ADDITEM ) { - #ifdef UNICODE - typedef struct tagTVINSERTSTRUCTW - { - HTREEITEM hParent; - HTREEITEM hInsertAfter; - TV_ITEMW item; - } TVINSERTSTRUCTW, FAR *LPTVINSERTSTRUCTW; - #else - typedef struct tagTVINSERTSTRUCTA - { - HTREEITEM hParent; - HTREEITEM hInsertAfter; - TV_ITEMA item; - } TVINSERTSTRUCTA, FAR *LPTVINSERTSTRUCTA; - #endif - TVINSERTSTRUCT tvis; LPTSTR text = HB_TCHAR_CONVTO( hb_parc( 3 ) ); diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index 47d1d597a9..9f928b4354 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -228,7 +228,7 @@ Known build issues won't work. - gtalleg, hbwhat contrib may not compile on all platforms/compilers. - hbcurl won't build when using DMC and libcurl 7.19.0. - Earlier versions build okay. + Earlier libcurl versions build okay. Version 1.0.1 (2008-09-10) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index e1bbcf842e..8c80aa6d58 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -351,7 +351,7 @@ FUNCTION Main( ... ) ENDSWITCH IF ! Empty( t_cARCH ) IF t_lInfo - OutStd( "hbmk: Autodetected HB_ARCHITECTURE: " + t_cARCH + hb_osNewLine() ) + OutStd( "hbmk: Autodetected architecture: " + t_cARCH + hb_osNewLine() ) ENDIF ENDIF ENDIF @@ -416,7 +416,7 @@ FUNCTION Main( ... ) cDynLibNamePrefix := "" cDynLibExt := ".dll" OTHERWISE - OutErr( "hbmk: Error: HB_ARCHITECTURE value unknown: " + t_cARCH + hb_osNewLine() ) + OutErr( "hbmk: Error: Architecture value unknown: " + t_cARCH + hb_osNewLine() ) PauseForKey() RETURN 1 ENDCASE @@ -456,16 +456,16 @@ FUNCTION Main( ... ) ENDIF IF ! Empty( t_cCOMP ) IF t_lInfo - OutStd( "hbmk: Autodetected HB_COMPILER: " + t_cCOMP + hb_osNewLine() ) + OutStd( "hbmk: Autodetected compiler: " + t_cCOMP + hb_osNewLine() ) ENDIF ELSE IF Empty( aCOMPDET ) - OutErr( "hbmk: Please choose a compiler by setting envvar HB_COMPILER." + hb_osNewLine() ) + OutErr( "hbmk: Please choose a compiler by using -comp= option or envvar HB_COMPILER." + hb_osNewLine() ) OutErr( " You have the following choices on your platform: " + hb_osNewLine() ) OutErr( " " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() ) ELSE - OutErr( "hbmk: Harbour Make couldn't detect any supported C compiler" + hb_osNewLine() ) - OutErr( " in your PATH. Please setup one or set envvar HB_COMPILER" + hb_osNewLine() ) + OutErr( "hbmk: Harbour Make couldn't detect any supported C compiler in your PATH." + hb_osNewLine() ) + OutErr( " Please setup one or set -comp= option or envvar HB_COMPILER " + hb_osNewLine() ) OutErr( " to one of these values:" + hb_osNewLine() ) OutErr( " " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() ) ENDIF @@ -474,7 +474,7 @@ FUNCTION Main( ... ) ENDIF ELSE IF AScan( aCOMPSUP, {|tmp| tmp == t_cCOMP } ) == 0 - OutErr( "hbmk: Error: HB_COMPILER value unknown." + hb_osNewLine() ) + OutErr( "hbmk: Error: Compiler value unknown." + hb_osNewLine() ) PauseForKey() RETURN 2 ENDIF