diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 525b3a89f1..7e2cbbf3f4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-31 00:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/pp/ppcore.c + ! fixed to not strip path in .d dependencies list for files included + from -I + + * harbour/utils/hbmk2/hbmk2.prg + % do not use FindHeader() for dependencies list extracted from .d + files - they should contain full paths so it's not necessary + 2011-01-31 00:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/3rd/sqlite3/sqlite3.hbc * contrib/hbmxml/3rd/minixml/mxml.hbc diff --git a/harbour/src/pp/ppcore.c b/harbour/src/pp/ppcore.c index 5014f486b2..909becbf5b 100644 --- a/harbour/src/pp/ppcore.c +++ b/harbour/src/pp/ppcore.c @@ -1958,7 +1958,7 @@ static PHB_PP_FILE hb_pp_FileNew( PHB_PP_STATE pState, const char * szFileName, if( file_in != NULL ) { iAction = HB_PP_OPEN_OK; - szFileName = pFileName->szName; + szFileName = szFileNameBuf; break; } pPath = pPath->pNext; diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 1e70b97c85..de3044fe5a 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -7110,17 +7110,15 @@ STATIC FUNCTION checkDepTime( hbmk, cFile, tTime ) hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: CHECKING....", cFile) ) ENDIF FOR EACH cDepFile IN hbmk[ _HBMK_hDEPTS ][ cFile ] - IF ( cDepFile := FindHeader( hbmk, cDepFile, "", .F., .F. ) ) != NIL - IF ! hb_FGetDateTime( cDepFile, @tDepTime ) .OR. ; - tDepTime > tTime - IF hbmk[ _HBMK_lDEBUGINC ] - hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: CHECK DepTime=%s !!! (%s>%s)", cDepFile, hb_tsToStr(tDepTime), hb_tsToStr(tTime) ) ) - ENDIF - RETURN .T. - ENDIF + IF ! hb_FGetDateTime( cDepFile, @tDepTime ) .OR. ; + tDepTime > tTime IF hbmk[ _HBMK_lDEBUGINC ] - hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: CHECK DepTime=%s (%s)", cDepFile, hb_tsToStr(tDepTime) ) ) + hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: CHECK DepTime=%s !!! (%s>%s)", cDepFile, hb_tsToStr(tDepTime), hb_tsToStr(tTime) ) ) ENDIF + RETURN .T. + ENDIF + IF hbmk[ _HBMK_lDEBUGINC ] + hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: CHECK DepTime=%s (%s)", cDepFile, hb_tsToStr(tDepTime) ) ) ENDIF NEXT ENDIF