From 363fec13d23b5cf743cf95346a5cff95a2ed22cb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 5 Jun 2009 04:45:35 +0000 Subject: [PATCH] 2009-06-05 06:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * Removed 'not recommended' text to not hurt any feelings. + Added hint to TROUBLESHOOTING section how to clear PATH with a simple and safe method. * utils/hbmk2/hbmk2.prg * Internal variable name change. * ChangeLog ! Fixed terminology in my prev entry (embedding -> nesting) --- harbour/ChangeLog | 22 +++++++++++++++++----- harbour/INSTALL | 8 +++++--- harbour/utils/hbmk2/hbmk2.prg | 26 +++++++++++++------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2c5e7ac5c5..c38577e6bb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-06-05 06:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * Removed 'not recommended' text to not hurt any feelings. + + Added hint to TROUBLESHOOTING section how to clear PATH + with a simple and safe method. + + * utils/hbmk2/hbmk2.prg + * Internal variable name change. + + * ChangeLog + ! Fixed terminology in my prev entry (embedding -> nesting) + 2009-06-05 06:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbclass.ch + extended support for xbase++ compatible method declaration: @@ -39,13 +51,13 @@ 2009-06-04 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg - + Added support for hbcs= lins in .hbc files. This means - they can now be embedded. Filters and macros are accepted, + + Added support for hbcs= lines in .hbc files. This means + they can now be nested. Filters and macros are accepted, extension optional, .hbc will be added. - ! Fixed wrongly calculated embedding level, counting now made + ! Fixed wrongly calculated nesting level, counting now made simpler. - + Added warning message if embedding level reached the maximum, - instead of just ignoring the to be embedded files. + + Added warning message if nesting level reached the maximum, + instead of just ignoring the to be nested files. * COPYING + Added utils/hbmk2 to the COMPILER LICENSE section. diff --git a/harbour/INSTALL b/harbour/INSTALL index e4ed06b242..3d0f9d855a 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -196,12 +196,12 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS msvc64 - Microsoft Visual C++ x86-64 msvcia64 - Microsoft Visual C++ IA-64 - Windows (supported, but not recommended, features may be missing) + Windows (supported, some features may be missing) ------- owatcom - Open Watcom C++ + bcc - Borland/CodeGear C++ 4.x and above icc - Intel(R) C/C++ iccia64 - Intel(R) C/C++ IA-64 - bcc - Borland/CodeGear C++ 4.x and above pocc - Pelles C 4.5 and above pocc64 - Pelles C 5.0 x86-64 and above xcc - Pelles C for xhb @@ -575,7 +575,9 @@ TROUBLESHOOTING - Make sure to install fresh source tree in a new local directory and start over. See HOW TO GET THE HARBOUR SOURCES section for instructions to get the source. - Keep you PATH clean from old, mixed compiler tools or other Harbour - versions when building Harbour. + versions when building Harbour. The surest way to achieve this is to leave + only GNU Make directory and compiler directory in PATH (order significant): + PATH=C:\;C:\ - Remove all old, unnecessary environment variables from your environment. Use only those documented in this file. - Try to do no or only small modifications at once to command examples diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d4b356495b..a0aae20aa0 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3847,7 +3847,7 @@ STATIC FUNCTION SetupForGT( cGT_New, /* @ */ cGT, /* @ */ lGUI ) #define _HEADSTATE_lAnyNewer 2 #define _HEADSTATE_MAX_ 2 -STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lIncTry, lCMode, /* @ */ headstate, nEmbedLevel ) +STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lIncTry, lCMode, /* @ */ headstate, nNestingLevel ) LOCAL cFile LOCAL fhnd LOCAL nPos @@ -3859,10 +3859,10 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc STATIC s_aExcl := { "windows.h", "ole2.h", "os2.h" } - DEFAULT nEmbedLevel TO 1 + DEFAULT nNestingLevel TO 1 DEFAULT cParentDir TO FN_DirGet( cFileName ) - IF nEmbedLevel == 1 + IF nNestingLevel == 1 headstate := Array( _HEADSTATE_MAX_ ) headstate[ _HEADSTATE_hFiles ] := hb_Hash() headstate[ _HEADSTATE_lAnyNewer ] := .F. @@ -3872,7 +3872,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc RETURN .F. ENDIF - IF nEmbedLevel > _HBMK_HEAD_NEST_MAX + IF nNestingLevel > _HBMK_HEAD_NEST_MAX RETURN .F. ENDIF @@ -3947,7 +3947,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc ENDIF IF cHeader != NIL .AND. ; - FindNewerHeaders( hbmk, cHeader, iif( lCMode, FN_DirGet( cFileName ), cParentDir ), tTimeParent, lIncTry, lCMode, @headstate, nEmbedLevel + 1 ) + FindNewerHeaders( hbmk, cHeader, iif( lCMode, FN_DirGet( cFileName ), cParentDir ), tTimeParent, lIncTry, lCMode, @headstate, nNestingLevel + 1 ) headstate[ _HEADSTATE_lAnyNewer ] := .T. /* Let it continue if we want to scan for header locations */ IF ! lIncTry @@ -4598,7 +4598,7 @@ STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly ) #define _EOL Chr( 10 ) -STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName, nEmbedLevel ) +STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) LOCAL cFile LOCAL cLine LOCAL cItem @@ -4636,7 +4636,7 @@ STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName, nEmbedLevel ) CASE Lower( Left( cLine, Len( "hbcs=" ) ) ) == "hbcs=" ; cLine := SubStr( cLine, Len( "hbcs=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) - IF nEmbedLevel < _HBMK_NEST_MAX + IF nNestingLevel < _HBMK_NEST_MAX cItem := PathProc( MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ), FN_DirGet( cFileName ) ) @@ -4657,7 +4657,7 @@ STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName, nEmbedLevel ) hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing: %1$s" ), cItem ) ) ENDIF - HBC_ProcessOne( hbmk, cItem, nEmbedLevel + 1 ) + HBC_ProcessOne( hbmk, cItem, nNestingLevel + 1 ) ELSE hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot nest deeper in %1$s" ), cFileName ) ) ENDIF @@ -4904,7 +4904,7 @@ STATIC FUNCTION ValueIsF( cString ) RETURN cString == "no" .OR. ; cString == "0" /* Compatibility */ -STATIC PROCEDURE HBM_Load( hbmk, aParams, cFileName, nEmbedLevel ) +STATIC PROCEDURE HBM_Load( hbmk, aParams, cFileName, nNestingLevel ) LOCAL cFile LOCAL cLine LOCAL cParam @@ -4927,19 +4927,19 @@ STATIC PROCEDURE HBM_Load( hbmk, aParams, cFileName, nEmbedLevel ) IF ! Empty( cParam ) DO CASE CASE ( Len( cParam ) >= 1 .AND. Left( cParam, 1 ) == "@" ) - IF nEmbedLevel < _HBMK_NEST_MAX + IF nNestingLevel < _HBMK_NEST_MAX cParam := SubStr( cParam, 2 ) IF Empty( FN_ExtGet( cParam ) ) cParam := FN_ExtSet( cParam, ".hbm" ) ENDIF - HBM_Load( hbmk, aParams, PathProc( cParam, cFileName ), nEmbedLevel + 1 ) /* Load parameters from script file */ + HBM_Load( hbmk, aParams, PathProc( cParam, cFileName ), nNestingLevel + 1 ) /* Load parameters from script file */ ELSE hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot nest deeper in %1$s" ), cFileName ) ) ENDIF CASE Lower( FN_ExtGet( cParam ) ) == ".hbm" .OR. ; Lower( FN_ExtGet( cParam ) ) == ".hbp" - IF nEmbedLevel < _HBMK_NEST_MAX - HBM_Load( hbmk, aParams, PathProc( cParam, cFileName ), nEmbedLevel + 1 ) /* Load parameters from script file */ + IF nNestingLevel < _HBMK_NEST_MAX + HBM_Load( hbmk, aParams, PathProc( cParam, cFileName ), nNestingLevel + 1 ) /* Load parameters from script file */ ELSE hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot nest deeper in %1$s" ), cFileName ) ) ENDIF