diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d6cbd701ca..de77c99760 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-09 11:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/console.c + * src/rtl/hbgtcore.c + * Made internal error codes of "terminal init failure"s + occuring in different situations different. I hope I + left 9998 for the one that happens usually. + + * contrib/Makefile + - Deleted hbnetio from list, it's now made by make.hbs. + + * config/postinst.hbs + * Minor. + 2010-07-09 10:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/make.hbs + Honor HB_BUILD_PARTS for contribs. diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index 2a246f5a44..97102370a5 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -156,7 +156,7 @@ STATIC FUNCTION mk_hbl( cIn, cOut ) aTrans := __i18n_potArrayLoad( cIn, @cErrorMsg ) IF aTrans != NIL IF hb_MemoWrit( cOut, hb_i18n_SaveTable( __i18n_hashTable( __i18n_potArrayToHash( aTrans, .F. ) ) ) ) - OutStd( "! Created " + cOut + " <- " + cIn + hb_eol() ) + OutStd( "! Created " + cOut + " <= " + cIn + hb_eol() ) RETURN .T. ELSE OutErr( "! Error: Cannot create file: " + cOut + hb_eol() ) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index c27bfa3273..7b0145793b 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -16,7 +16,6 @@ DIRS := \ hbmemio \ hbmisc \ hbmzip \ - hbnetio \ hbnf \ hbodbc \ hbsms \ @@ -31,6 +30,7 @@ DIRS := \ # under testing in make.hbs # hbblink \ # hbclipsm \ +# hbnetio \ # rddbmcdx \ # contribs _with_ external dependencies diff --git a/harbour/src/rtl/console.c b/harbour/src/rtl/console.c index 49cdb3efb5..91d0e1c282 100644 --- a/harbour/src/rtl/console.c +++ b/harbour/src/rtl/console.c @@ -165,7 +165,7 @@ void hb_conInit( void ) hb_fsSetDevMode( s_hFilenoStderr, FD_BINARY ); if( hb_gtInit( s_hFilenoStdin, s_hFilenoStdout, s_hFilenoStderr ) != HB_SUCCESS ) - hb_errInternal( 9998, "Harbour terminal (GT) initialization failure", NULL, NULL ); + hb_errInternal( 9995, "Harbour terminal (GT) initialization failure", NULL, NULL ); if( hb_cmdargCheck( "INFO" ) ) { diff --git a/harbour/src/rtl/hbgtcore.c b/harbour/src/rtl/hbgtcore.c index a8a3a4e913..eacfeaac20 100644 --- a/harbour/src/rtl/hbgtcore.c +++ b/harbour/src/rtl/hbgtcore.c @@ -3258,7 +3258,7 @@ PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSuperTable ) if( hb_stricmp( szGtName, "nul" ) == 0 || hb_stricmp( szGtName, "null" ) == 0 ) { if( pGT || pSuperTable ) - hb_errInternal( 9998, "Harbour terminal (GT) initialization failure", NULL, NULL ); + hb_errInternal( 9996, "Harbour terminal (GT) initialization failure", NULL, NULL ); pGT = ( PHB_GT_BASE ) hb_xgrab( sizeof( HB_GT_BASE ) ); memset( pGT, 0, sizeof( HB_GT_BASE ) );