From f24d2827b2cc30f3cf67d52fce5ecf821b921aed Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 24 Jan 2010 13:29:14 +0000 Subject: [PATCH] 2010-01-24 14:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed to recognize files when uppercase extensions are is in .hbc/sources= directive. [TOMERGE 2.0] --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 26 ++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 75e7ba2063..fbdcddba22 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-24 14:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed to recognize files when uppercase extensions are is in + .hbc/sources= directive. + [TOMERGE 2.0] + 2010-01-24 12:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.pt_BR.po * utils/hbmk2/hbmk2.hu_HU.po diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d156f58dcd..f758fdaca0 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -6064,6 +6064,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) LOCAL cFile LOCAL cLine LOCAL cItem + LOCAL cItemL LOCAL tmp IF ! hb_FileExists( cFileName ) @@ -6099,27 +6100,28 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) cItem := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ), FN_DirGet( cFileName ) ) ) ) IF ! Empty( cItem ) + cItemL := Lower( cItem ) DO CASE - CASE FN_ExtGet( cItem ) == ".o" .OR. ; - FN_ExtGet( cItem ) == ".obj" + CASE FN_ExtGet( cItemL ) == ".o" .OR. ; + FN_ExtGet( cItemL ) == ".obj" AAddNew( hbmk[ _HBMK_aOBJUSER ], PathSepToTarget( hbmk, cItem ) ) - CASE FN_ExtGet( cItem ) == ".c" + CASE FN_ExtGet( cItemL ) == ".c" AAddNew( hbmk[ _HBMK_aC ], PathSepToTarget( hbmk, cItem ) ) - CASE FN_ExtGet( cItem ) == ".cpp" .OR. ; - FN_ExtGet( cItem ) == ".cc" .OR. ; - FN_ExtGet( cItem ) == ".cxx" .OR. ; - FN_ExtGet( cItem ) == ".cx" + CASE FN_ExtGet( cItemL ) == ".cpp" .OR. ; + FN_ExtGet( cItemL ) == ".cc" .OR. ; + FN_ExtGet( cItemL ) == ".cxx" .OR. ; + FN_ExtGet( cItemL ) == ".cx" AAddNew( hbmk[ _HBMK_aCPP ], PathSepToTarget( hbmk, cItem ) ) - CASE FN_ExtGet( cItem ) == ".d" + CASE FN_ExtGet( cItemL ) == ".d" deplst_read( hbmk[ _HBMK_hDEPTS ], PathSepToSelf( cItem ) ) - CASE FN_ExtGet( cItem ) == ".po" .OR. ; - FN_ExtGet( cItem ) == ".pot" + CASE FN_ExtGet( cItemL ) == ".po" .OR. ; + FN_ExtGet( cItemL ) == ".pot" AAddNew( hbmk[ _HBMK_aPO ], PathSepToTarget( hbmk, cItem ) ) - CASE FN_ExtGet( cItem ) == ".rc" + CASE FN_ExtGet( cItemL ) == ".rc" FOR EACH tmp IN FN_Expand( cItem ) AAddNew( hbmk[ _HBMK_aRESSRC ], PathSepToTarget( hbmk, tmp ) ) NEXT - CASE FN_ExtGet( cItem ) == ".res" + CASE FN_ExtGet( cItemL ) == ".res" IF hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm" /* For MinGW family add .res files as source input, as they will need to be converted to coff format with windres (just