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

2011-01-31 00:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/pp/ppcore.c
    ! fixed to not strip path in .d dependencies list for files included
      from -I<directories>

  * 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
This commit is contained in:
Przemyslaw Czerpak
2011-01-30 23:54:38 +00:00
parent 655adbdf10
commit 0e49bea8f9
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -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<directories>
* 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

2
harbour/src/pp/ppcore.c
View File

@@ -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;

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

@@ -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