fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-03-13 11:10 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! in '.hbc not found' messages show .hbc reference without 
      rebased path (=as it appears in .hbp file or on cmdline), 
      after macro expension.
This commit is contained in:
Viktor Szakats
2012-03-13 10:11:37 +00:00
parent 2f1def26bf
commit 2d445dd821
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -16,6 +16,12 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-03-13 11:10 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! in '.hbc not found' messages show .hbc reference without
rebased path (=as it appears in .hbp file or on cmdline),
after macro expension.
2012-03-13 00:47 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbqt/hbqt_common.hbm
! added special install support for unique dir structure of hbqt

23
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2972,7 +2972,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE hb_FNameExt( cParamL ) == ".hbc"
cParam := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
cParam := tmp1 := MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] )
cParam := PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
lFound := .F.
IF hb_FileExists( cParam )
@@ -2997,9 +2998,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
HBC_ProcessOne( hbmk, cParam, 1 )
ELSE
IF Empty( aParam[ _PAR_cFileName ] )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s" ), cParam ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s" ), tmp1 ) )
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), cParam, aParam[ _PAR_cFileName ] ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), tmp1, aParam[ _PAR_cFileName ] ) )
ENDIF
ENDIF
ENDIF
@@ -9180,7 +9181,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
LOCAL cItemL
LOCAL cName
LOCAL lFound
LOCAL tmp
LOCAL tmp, tmp1
#if defined( __PLATFORM__DOS )
IF ! hbmk_dos_FileExists( cFileName )
@@ -9280,7 +9281,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
CASE Lower( Left( cLine, Len( "libs=" ) ) ) == "libs=" ; cLine := SubStr( cLine, Len( "libs=" ) + 1 )
FOR EACH cItem IN hb_ATokens( cLine,, .T. )
cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
cItem := tmp1 := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
IF hb_FNameExt( cItem ) == ".hbc"
cItem := PathMakeAbsolute( PathSepToSelf( cItem ), hb_FNameDir( cFileName ) )
IF nNestingLevel < _HBMK_NEST_MAX
@@ -9306,7 +9307,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
HBC_ProcessOne( hbmk, cItem, nNestingLevel + 1 )
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), cItem, cFileName ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), tmp1, cFileName ) )
ENDIF
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot nest deeper in %1$s" ), cFileName ) )
@@ -9351,7 +9352,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
FOR EACH cItem IN hb_ATokens( cLine,, .T. )
IF nNestingLevel < _HBMK_NEST_MAX
cItem := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) ), hb_FNameDir( cFileName ) )
cItem := tmp1 := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
cItem := PathMakeAbsolute( PathSepToSelf( cItem ), hb_FNameDir( cFileName ) )
IF Empty( hb_FNameExt( cItem ) )
cItem := hb_FNameExtSet( cItem, ".hbc" )
@@ -9379,7 +9381,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
HBC_ProcessOne( hbmk, cItem, nNestingLevel + 1 )
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), cItem, cFileName ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), tmp1, cFileName ) )
ENDIF
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot nest deeper in %1$s" ), cFileName ) )
@@ -9391,7 +9393,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
IF autohbc_split_arg( cItem, @cName, @cItem )
cItem := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) ), hb_FNameDir( cFileName ) )
cItem := tmp1 := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
cItem := PathMakeAbsolute( PathSepToSelf( cItem ), hb_FNameDir( cFileName ) )
IF Empty( hb_FNameExt( cName ) )
cName := hb_FNameExtSet( cName, ".ch" )
@@ -9416,7 +9419,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
IF lFound
hbmk[ _HBMK_hAUTOHBC ][ AllTrim( StrTran( cName, "\", "/" ) ) ] := cItem
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), cItem, cFileName ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), tmp1, cFileName ) )
ENDIF
ENDIF
NEXT