From d77cccf97d18b7a6ad0cd11d24f56cb255cfbff0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 7 Nov 2012 03:27:23 +0000 Subject: [PATCH] 2012-11-07 04:26 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbformat/hbfuncs.prg * minor cleanup to how contrib .hbx parsing is optimized out. --- harbour/ChangeLog | 4 ++++ harbour/contrib/hbformat/hbfuncs.prg | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index be4e9cc325..f385e0e086 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-07 04:26 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbformat/hbfuncs.prg + * minor cleanup to how contrib .hbx parsing is optimized out. + 2012-11-07 04:18 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/httpsrv/cgifunc.prg * extras/httpsrv/modules/tableservletdb.prg diff --git a/harbour/contrib/hbformat/hbfuncs.prg b/harbour/contrib/hbformat/hbfuncs.prg index 365c9fe31b..314eb67ecd 100644 --- a/harbour/contrib/hbformat/hbfuncs.prg +++ b/harbour/contrib/hbformat/hbfuncs.prg @@ -56,22 +56,23 @@ PROCEDURE __hbformat_BuildListOfFunctions( /* @ */ cFunctions, cHBXList ) LOCAL aFile LOCAL cName - LOCAL lAnyHBR + LOCAL lContribHBR := .F. /* from built-in core .hbx file */ HBXToFuncList( @cFunctions, __harbour_hbx() ) /* from .hbr container files */ - lAnyHBR := .F. FOR EACH aFile IN Directory( hb_DirBase() + "*.hbr" ) - lAnyHBR := .T. + IF hb_FileMatch( hb_FNameName( aFile[ F_NAME ] ), "contrib" ) + lContribHBR := .T. + ENDIF FOR EACH cName IN hb_Deserialize( hb_ZUncompress( hb_MemoRead( hb_DirBase() + aFile[ F_NAME ] ) ) ) cFunctions += "," + cName:__enumKey() NEXT NEXT /* from standalone .hbx files in some known locations */ - IF ! lAnyHBR + IF ! lContribHBR WalkDir( hb_DirBase() + ".." + hb_ps() + "contrib", @cFunctions ) ENDIF WalkDir( hb_DirBase() + ".." + hb_ps() + "addons", @cFunctions )