From 3f852ef8c0c6d7f57be09029ad734cbf22fdf46a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 6 Jun 2009 07:09:34 +0000 Subject: [PATCH] 2009-06-06 09:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * Input files with following extensions won't be considered .prg source files anymore: .ch, .h, .hpp, .hxx. This means *.* input mask can now be used more freely. I cannot imagine a situation where this could be limitation, but if someone has any concern with this, please tell. ! Minor typo in code. --- harbour/ChangeLog | 10 +++++++++- harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9b980cbc38..f380cece9a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-06 09:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * Input files with following extensions won't be considered + .prg source files anymore: .ch, .h, .hpp, .hxx. + This means *.* input mask can now be used more freely. + I cannot imagine a situation where this could be limitation, + but if someone has any concern with this, please tell. + ! Minor typo in code. + 2009-06-05 18:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/Makefile_gen @@ -80,7 +89,6 @@ + Added few new classes. With this commit number of classes have reached 153. - 2009-06-06 02:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rdd/dbfnsx/dbfnsx1.c ! fixed stupid typo in C else block scope which caused false alarm diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 5b3545c4bf..2764447258 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1711,8 +1711,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) DEFAULT s_cFIRST TO PathSepToSelf( cParam ) NEXT - CASE FN_ExtGet( cParamL ) $ ".po" .OR. ; - FN_ExtGet( cParamL ) $ ".pot" + CASE FN_ExtGet( cParamL ) == ".po" .OR. ; + FN_ExtGet( cParamL ) == ".pot" FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) ) AAdd( hbmk[ _HBMK_aPO ], PathSepToTarget( hbmk, cParam ) ) @@ -1724,7 +1724,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) OTHERWISE - IF ! Empty( cParam ) + IF ! Empty( cParam ) .AND. !( FN_ExtGet( cParamL ) ) $ ".ch|.hpp|.hxx|.h" cParam := PathProc( cParam, aParam[ _PAR_cFileName ] ) AAdd( s_aPRG , PathSepToTarget( hbmk, cParam ) ) DEFAULT s_cFIRST TO PathSepToSelf( cParam )