diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 200e3197b0..03bb5acc90 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,31 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-04 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbziparch/Makefile + ! Fixed commented file in file list. + ; This may fix some GNU-make problems regarding hbziparch. + ; hbziparch may not work in RC2 GNU-make builds for this + reason. + + * harbour-ce-spec + * harbour-w32-spec + * doc/whatsnew.txt + * include/hbver.h + * harbour.spec + * RC2 -> rc2 + ; We should use lowercase for 'RC' in the future, for consistency + with 'alpha', 'beta' (and with other projects too). It looks + smoother too. + + * source/rtl/errorint.c + ! hb_setGetCPtr( HB_SET_HBOUTLOG ) checked for NULL value. + I'm not sure if this is required in real life, so this may + be unnecessary safety. + + * utils/Makefile + * Formatting. + 2008-07-04 04:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbmzip/hbmzip.c + Reenabled new OS/2 code. diff --git a/harbour/contrib/hbziparch/Makefile b/harbour/contrib/hbziparch/Makefile index 92ab2f1553..56733adaf9 100644 --- a/harbour/contrib/hbziparch/Makefile +++ b/harbour/contrib/hbziparch/Makefile @@ -47,7 +47,6 @@ CPP_SOURCES = \ ZipException.cpp \ ZipExtraData.cpp \ ZipExtraField.cpp \ -# ZipFile_mfc.cpp \ ZipFile_stl.cpp \ ZipFileHeader.cpp \ ZipMemFile.cpp \ @@ -55,6 +54,8 @@ CPP_SOURCES = \ ZipStorage.cpp \ ZipString.cpp \ +# ZipFile_mfc.cpp \ + ifeq ($(HB_ARCHITECTURE),win32) CPP_SOURCES += \ ZipPathComponent_win.cpp \ diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index 3aaee21aaa..85487f7946 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -2,7 +2,7 @@ * $Id$ */ -Version 1.0.0 RC2 (2008-07-01) tag: 1.0.0RC2 +Version 1.0.0 rc2 (2008-07-01) tag: 1.0.0rc2 General ============================= @@ -54,7 +54,7 @@ Contrib instead. - Optimizations and minor fixes. -Version 1.0.0 RC1 (2008-06-04) tag: 1.0.0RC1 +Version 1.0.0 rc1 (2008-06-04) tag: 1.0.0rc1 General ============================= diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index c94edc57ef..3f8cad2c01 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -26,7 +26,7 @@ %define name harbour-ce %define version 1.0.0 -%define releasen RC2 +%define releasen rc2 %define hb_pref hbce %define hb_ccpath /opt/mingw32ce/bin %define hb_ccpref arm-wince-mingw32ce- diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index ac18261c7d..4071bfb73a 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -26,7 +26,7 @@ %define name harbour-w32 %define version 1.0.0 -%define releasen RC2 +%define releasen rc2 %define hb_pref hbw %define hb_ccpath /opt/xmingw/bin %define hb_ccpref i386-mingw32- diff --git a/harbour/harbour.spec b/harbour/harbour.spec index d93fb010ed..d5e331d55c 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -61,7 +61,7 @@ %define name harbour %define dname Harbour %define version 1.0.0 -%define releasen RC2 +%define releasen rc2 %define hb_pref hb %define hb_arch export HB_ARCHITECTURE=linux %define hb_cc export HB_COMPILER=gcc diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index a90f63e6a7..b556d17b70 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -64,7 +64,7 @@ #define HB_VER_MAJOR 1 /* Major version number */ #define HB_VER_MINOR 0 /* Minor version number */ #define HB_VER_REVISION 0 /* Revision number */ -#define HB_VER_STATUS "RC2" /* Build status */ +#define HB_VER_STATUS "rc2" /* Build status */ #define __HARBOUR__ 0x010000 /* Two bytes: Major + Minor + Revision. This is recommented for 3rd party .c and .prg level code. */ #endif /* HB_VER_H_ */ diff --git a/harbour/source/rtl/errorint.c b/harbour/source/rtl/errorint.c index 7bdf2a6115..b775e5e14c 100644 --- a/harbour/source/rtl/errorint.c +++ b/harbour/source/rtl/errorint.c @@ -78,7 +78,7 @@ void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, fLang = ( hb_langID() != NULL ); - hLog = hb_fopen( hb_setGetCPtr( HB_SET_HBOUTLOG ), "a+" ); + hLog = hb_fopen( hb_setGetCPtr( HB_SET_HBOUTLOG ) ? hb_setGetCPtr( HB_SET_HBOUTLOG ) : "hb_out.log", "a+" ); if( hLog ) { diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile index 5d837680e6..2154169a0b 100644 --- a/harbour/utils/Makefile +++ b/harbour/utils/Makefile @@ -13,6 +13,7 @@ DIRS=\ hbtest \ hbmake \ $(HB_UTILS) \ + # hbextern \ include $(ROOT)config/dir.cf