diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd5f46c042..9bf07c0d3e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-11 21:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/common/hbverdsp.c + * Streamlined the /build information screen. It's now + more compact and now show if tracing is enabled. Max + symbol length got removed, ANSI C startup also, because + it needs a custom C flag anyway. + + * include/hbvmpub.h + * include/hbsetup.h + * HB_SYMBOL_NAME_LEN moved away from custom setup. + This isn't an option users should normally tinker. + + * tests/run_prg.bat + * Minor. + 2008-11-11 15:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbcompdf.h * harbour/source/compiler/harbour.yyc diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 6e8c0e3cfe..c95b2d999d 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -180,19 +180,6 @@ /* #define HB_MAIN_STD */ /* #define HB_MAIN_WIN */ -/* *********************************************************************** - * You can set here the maximum symbol name length handled by Harbour - * compiler and runtime. You can override this setting in the make process. - * Setting this too low, may result in clashing symbols in Harbour - * itself. For strict CA-Cl*pper compatibility a value of 10 would have - * to be used, but Harbour won't properly compile using this setting. - * - * By default this value is 63 - */ -#ifndef HB_SYMBOL_NAME_LEN - #define HB_SYMBOL_NAME_LEN 63 -#endif - /* *********************************************************************** * You can enable here support for multiline strings concatenated by ';' * f.e.: diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h index 89454ec804..2299ceeaae 100644 --- a/harbour/include/hbvmpub.h +++ b/harbour/include/hbvmpub.h @@ -55,6 +55,11 @@ #include "hbdefs.h" +/* Maximum symbol name length handled by Harbour compiler and runtime. + For strict CA-Cl*pper compatibility a value of 10 would have + to be used, but Harbour won't properly compile using this setting. */ +#define HB_SYMBOL_NAME_LEN 63 + HB_EXTERN_BEGIN #ifdef _HB_API_INTERNAL_ diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c index 178a80725f..eb443f1b1b 100644 --- a/harbour/source/common/hbverdsp.c +++ b/harbour/source/common/hbverdsp.c @@ -68,13 +68,6 @@ void hb_verBuildInfo( void ) hb_xfree( pszVersion ); } - { - char * pszPCode = hb_verPCode(); - hb_conOutErr( pszPCode, 0 ); - hb_conOutErr( hb_conNewLine(), 0 ); - hb_xfree( pszPCode ); - } - { char * pszVersion = hb_verCompiler(); hb_conOutErr( "Compiler: ", 0 ); @@ -91,14 +84,11 @@ void hb_verBuildInfo( void ) hb_xfree( pszVersion ); } - hb_conOutErr( hb_conNewLine(), 0 ); - { - char * pszBuildDate = hb_verBuildDate(); - hb_conOutErr( "Built on: ", 0 ); - hb_conOutErr( pszBuildDate, 0 ); + char * pszPCode = hb_verPCode(); + hb_conOutErr( pszPCode, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); - hb_xfree( pszBuildDate ); + hb_xfree( pszPCode ); } hb_conOutErr( "ChangeLog last entry: ", 0 ); @@ -109,11 +99,21 @@ void hb_verBuildInfo( void ) hb_conOutErr( hb_verSvnChangeLogID(), 0 ); hb_conOutErr( hb_conNewLine(), 0 ); + hb_conOutErr( hb_conNewLine(), 0 ); + + { + char * pszBuildDate = hb_verBuildDate(); + hb_conOutErr( "Built on: ", 0 ); + hb_conOutErr( pszBuildDate, 0 ); + hb_conOutErr( hb_conNewLine(), 0 ); + hb_xfree( pszBuildDate ); + } + { const char * pszFlags = hb_verFlagsPRG(); if( pszFlags && *pszFlags ) { - hb_conOutErr( "Extra Harbour compiler switches: ", 0 ); + hb_conOutErr( "Extra Harbour compiler options: ", 0 ); hb_conOutErr( pszFlags, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); } @@ -123,7 +123,7 @@ void hb_verBuildInfo( void ) const char * pszFlags = hb_verFlagsC(); if( pszFlags && *pszFlags ) { - hb_conOutErr( "Extra C compiler switches: ", 0 ); + hb_conOutErr( "Extra C compiler options: ", 0 ); hb_conOutErr( pszFlags, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); } @@ -133,124 +133,61 @@ void hb_verBuildInfo( void ) const char * pszFlags = hb_verFlagsL(); if( pszFlags && *pszFlags ) { - hb_conOutErr( "Extra linker switches: ", 0 ); + hb_conOutErr( "Extra linker options: ", 0 ); hb_conOutErr( pszFlags, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); } } - hb_conOutErr( "Other build settings: ", 0 ); + hb_conOutErr( "Build options: ", 0 ); + if( hb_xquery( HB_MEM_USEDMAX ) != 0 ) + hb_conOutErr( "(memory tracking) ", 0 ); +#if defined( HB_TR_LEVEL ) + hb_conOutErr( "(tracing) ", 0 ); +#endif +#if ! defined( HB_NO_PROFILER ) + hb_conOutErr( "(profiler) ", 0 ); +#endif #if defined(__cplusplus) hb_conOutErr( "(C++ mode) ", 0 ); #else hb_conOutErr( "(C mode) ", 0 ); -#endif -#if defined( HB_STRICT_ANSI_C ) - hb_conOutErr( "(ANSI C symbol initialization) ", 0 ); #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Clipper 5.3b compatible extensions: ", 0 ); + hb_conOutErr( "Language options: ", 0 ); #if defined( HB_COMPAT_C53 ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(C5.3) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Clipper 5.2e/5.3b compatible undocumented: ", 0 ); #if defined( HB_C52_UNDOC ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(C5.x undoc) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Clipper 5.2e/5.3b strict compatibility: ", 0 ); #if defined( HB_C52_STRICT ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(C5.x strict) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Xbase++ compatible extensions: ", 0 ); #if defined( HB_COMPAT_XPP ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(XBase++) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "FlagShip compatible extensions: ", 0 ); #if defined( HB_COMPAT_FLAGSHIP ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(Flagship) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Visual Objects compatible extensions: ", 0 ); #if defined( HB_COMPAT_VO ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(VO) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "FoxPro compatible extensions: ", 0 ); #if defined( HB_COMPAT_FOXPRO ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(FoxPro) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "dBase compatible extensions: ", 0 ); #if defined( HB_COMPAT_DBASE ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(dBase) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "CLIP compatible extensions: ", 0 ); #if defined( HB_COMPAT_CLIP ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(CLIP) ", 0 ); #endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Non-portable Harbour extensions: ", 0 ); #if defined( HB_EXTENSION ) - hb_conOutErr( "yes", 0 ); -#else - hb_conOutErr( "no", 0 ); + hb_conOutErr( "(dirty extensions) ", 0 ); #endif hb_conOutErr( hb_conNewLine(), 0 ); - hb_conOutErr( "Profiler: ", 0 ); -#if defined( HB_NO_PROFILER ) - hb_conOutErr( "off", 0 ); -#else - hb_conOutErr( "on", 0 ); -#endif - hb_conOutErr( hb_conNewLine(), 0 ); - - hb_conOutErr( "Memory tracing and statistics: ", 0 ); - hb_conOutErr( hb_xquery( HB_MEM_USEDMAX ) != 0 ? "on" : "off", 0 ); - hb_conOutErr( hb_conNewLine(), 0 ); - - { - char buffer[ 64 ]; - hb_snprintf( buffer, sizeof( buffer ), "Maximum symbol name length: %i", HB_SYMBOL_NAME_LEN ); - hb_conOutErr( buffer, 0 ); - hb_conOutErr( hb_conNewLine(), 0 ); - } - hb_conOutErr( "---------------------------", 0 ); hb_conOutErr( hb_conNewLine(), 0 ); } diff --git a/harbour/tests/run_prg.bat b/harbour/tests/run_prg.bat index 667c3c5b58..57c2ab3493 100644 --- a/harbour/tests/run_prg.bat +++ b/harbour/tests/run_prg.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -..\bin\harbour %1 /n /i..\include /gh +..\bin\harbour %1 -n -i..\include -gh ..\bin\hbrun %1 del %1.hrb