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

2009-07-14 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/pp/hbpp.c
  * source/pp/Makefile
    + Moved ChangeLog name detection logic to C level.
This commit is contained in:
Viktor Szakats
2009-07-14 16:32:01 +00:00
parent 38d9c0e799
commit 40a550d49b
3 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-14 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/pp/hbpp.c
* source/pp/Makefile
+ Moved ChangeLog name detection logic to C level.
2009-07-14 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-func.sh
* make_gnu.sh

23
harbour/source/pp/Makefile
View File

@@ -26,33 +26,12 @@ INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
HB_VERHEADER=$(TOP)$(ROOT)include/hbverbld.h
ifeq ($(HB_CHANGELOG),)
ifneq ($(HB_ARCHITECTURE)/$(HB_COMPILER),dos/watcom)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]og)
endif
ifeq ($(HB_CHANGELOG),)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]o)
ifeq ($(HB_CHANGELOG),)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~1)
ifeq ($(HB_CHANGELOG),)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~?)
ifeq ($(HB_CHANGELOG),)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hang~??)
ifeq ($(HB_CHANGELOG),)
HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]og)
endif
endif
endif
endif
endif
endif
ifneq ($(HB_PP_RULES),)
pptable.c : $(HB_PP_RULES)
$(CP) $(subst /,$(DIRSEP),$<) $@
else
pptable.c : hbpp$(EXE_EXT)
$(HB_PPGEN_PATH)/hbpp$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(HB_CHANGELOG) -v$(HB_VERHEADER)
$(HB_PPGEN_PATH)/hbpp$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c -v$(HB_VERHEADER)
endif
ifneq ($(HB_BIN_INSTALL),)

38
harbour/source/pp/hbpp.c
View File

@@ -441,18 +441,44 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
int iResult = 0;
const char * pszFile;
FILE * file_in;
int tmp;
BOOL bFound;
pszFile = pszFileName ? pszFileName : "../../../../ChangeLog";
const char * names[] = { NULL
, "../../../../ChangeLog"
, "../../../../CHANGES"
#if defined( HB_OS_DOS )
, "../../../../ChangeLo"
, "../../../../Change~1"
, "../../../../Chang~01"
#endif
};
if( !pszFileName )
names[ 0 ] = pszFileName;
pszFile = NULL;
bFound = FALSE;
for( tmp = 0; tmp < ( int ) HB_SIZEOFARRAY( names ) && ! bFound; ++tmp )
{
while( *pszFile == '.' )
pszFile = names[ tmp ];
if( pszFile )
{
if( hb_fsFileExists( pszFile ) )
break;
pszFile += 3;
while( *pszFile == '.' )
{
if( hb_fsFileExists( pszFile ) )
{
bFound = TRUE;
break;
}
pszFile += 3;
}
}
}
if( pszFile )
fprintf( stdout, "Using ChangeLog file: %s\n", pszFile );
file_in = hb_fopen( pszFile, "r" );
if( !file_in )
{