From ea59458fb6385ccf7ab319d5e7117a8e889c905f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 13 Jan 2013 19:52:04 +0000 Subject: [PATCH] 2013-01-13 20:51 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + display option source file/line in some output messages ! '-nooptim' option was not recognized after 2009-05-13 08:10 UTC+0200 (recommended format '-optim-' was working all along) --- harbour/ChangeLog.txt | 10 ++++++++++ harbour/utils/hbmk2/hbmk2.prg | 13 +++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 2b91973b4a..b5665570f0 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-01-13 20:51 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + + display option source file/line in some output messages + ! '-nooptim' option was not recognized after 2009-05-13 08:10 UTC+0200 + (recommended format '-optim-' was working all along) + +2013-01-13 20:46 UTC+0100 Viktor Szakats (harbour syenar.net) + * ChangeLog.txt + * utils/hbmk2/hbmk2.prg + 2013-01-12 13:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/src/vm/classes.c ! fixed bug in scope checking diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index dfadbb4d55..030c1ef450 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2423,7 +2423,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cParamL == "-nodebug" ; hbmk[ _HBMK_lDEBUG ] := .F. CASE cParamL == "-optim" ; hbmk[ _HBMK_lOPTIM ] := .T. CASE cParamL == "-optim-" .OR. ; - cParamL == "-noopt" ; hbmk[ _HBMK_lOPTIM ] := .F. + cParamL == "-nooptim" ; hbmk[ _HBMK_lOPTIM ] := .F. CASE cParamL == "-debugtime" ; hbmk[ _HBMK_lDEBUGTIME ] := .T. CASE cParamL == "-debuginc" ; hbmk[ _HBMK_lDEBUGINC ] := .T. CASE cParamL == "-debugstub" ; hbmk[ _HBMK_lDEBUGSTUB ] := .T. @@ -2819,7 +2819,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! Empty( tmp ) tmp := hb_DirSepDel( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) ) IF hb_FileMatch( tmp, hbmk[ _HBMK_cHB_INSTALL_LIB ] ) - _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Ignoring explicitly specified core library directory: %1$s" ), tmp ) ) + _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Ignoring explicitly specified core library directory: %1$s (in option %2$s)" ), tmp, ParamToString( aParam ) ) ) ELSE IF ( _MACRO_LATE_PREFIX + _MACRO_OPEN ) $ tmp .OR. hb_DirExists( tmp ) AAdd( hbmk[ _HBMK_aLIBPATH ], tmp ) @@ -2891,7 +2891,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! Empty( tmp ) tmp := hb_DirSepDel( hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) ) ) IF hb_FileMatch( tmp, hbmk[ _HBMK_cHB_INSTALL_INC ] ) - _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Ignoring explicitly specified core header directory: %1$s" ), tmp ) ) + _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Ignoring explicitly specified core header directory: %1$s (in option %2$s)" ), tmp, ParamToString( aParam ) ) ) ELSE AAddNew( hbmk[ _HBMK_aINCPATH ], tmp ) ENDIF @@ -3387,7 +3387,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF hbmk[ _HBMK_lDEBUGPARS ] FOR EACH aParam IN aParams - _hbmk_OutStd( hbmk, hb_StrFormat( "debugpars: %1$3d '%2$s' (%3$s:%4$d)", aParam:__enumIndex(), aParam[ _PAR_cParam ], aParam[ _PAR_cFileName ], aParam[ _PAR_nLine ] ) ) + _hbmk_OutStd( hbmk, hb_StrFormat( "debugpars: %1$3d %2$s", aParam:__enumIndex(), ParamToString( aParam ) ) ) NEXT ENDIF @@ -7222,6 +7222,11 @@ STATIC PROCEDURE ProcEnvOption( cValue ) RETURN +STATIC FUNCTION ParamToString( aParam ) + RETURN iif( Empty( aParam[ _PAR_cFileName ] ), ; + hb_StrFormat( "'%1$s'", aParam[ _PAR_cParam ] ), ; /* on the command line */ + hb_StrFormat( "'%1$s' in %2$s:%3$d", aParam[ _PAR_cParam ], aParam[ _PAR_cFileName ], aParam[ _PAR_nLine ] ) ) + STATIC FUNCTION CheckLibParam( hbmk, cLibName ) cLibName := Lower( cLibName )