From d2d521c8e1a7cbafbf9bc3f3e0c1042ba41de058 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 11 Apr 2012 11:55:20 +0000 Subject: [PATCH] 2012-04-11 13:53 UTC+0200 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg * do not consider ".C" (uppercase c) as C++ source file. it might have caused confusion when bringing .c source files from legacy filesystems like MS-DOS, it may also be an advantage when doing multiplatform development between MS-DOS and newer systems. --- harbour/ChangeLog | 8 ++++++++ harbour/utils/hbmk2/hbmk2.prg | 16 +++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c5485e6406..33cb14b824 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-11 13:53 UTC+0200 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + * do not consider ".C" (uppercase c) as C++ source file. + it might have caused confusion when bringing .c source + files from legacy filesystems like MS-DOS, it may also + be an advantage when doing multiplatform development + between MS-DOS and newer systems. + 2012-04-10 17:57 UTC+0200 Viktor Szakats (harbour syenar.net) * src/rtl/tget.prg ! ignore custom picture mask characters for date var type diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 31e9020390..3454e1093d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -271,13 +271,6 @@ REQUEST hbmk_KEYW #define _BCC_BIN_DETECT() FindInPath( "bcc32.exe" ) -/* Macro to check for uppercase extension on case-sensitive filesystems */ -#if defined( __PLATFORM__DOS ) - #define _EXT_IS_UPPER( f, e ) ( .F. ) -#else - #define _EXT_IS_UPPER( f, e ) ( hb_FNameExt( f ) == e ) -#endif - #define HB_ISALPHA( c ) ( Upper( c ) >= "A" .AND. Upper( c ) <= "Z" ) #define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) .OR. ( c ) == '_' ) #define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR(c) .OR. IsDigit( c ) ) @@ -3082,8 +3075,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE hb_FNameExt( cParamL ) == ".cpp" .OR. ; hb_FNameExt( cParamL ) == ".cc" .OR. ; hb_FNameExt( cParamL ) == ".cxx" .OR. ; - hb_FNameExt( cParamL ) == ".cx" .OR. ; - _EXT_IS_UPPER( cParam, ".C" ) + hb_FNameExt( cParamL ) == ".cx" FOR EACH cParam IN FN_Expand( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) ) AAdd( hbmk[ _HBMK_aCPP ], cParam ) @@ -9250,8 +9242,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) CASE hb_FNameExt( cItemL ) == ".cpp" .OR. ; hb_FNameExt( cItemL ) == ".cc" .OR. ; hb_FNameExt( cItemL ) == ".cxx" .OR. ; - hb_FNameExt( cItemL ) == ".cx" .OR. ; - _EXT_IS_UPPER( cItem, ".C" ) + hb_FNameExt( cItemL ) == ".cx" AAddNew( hbmk[ _HBMK_aCPP ], cItem ) CASE hb_FNameExt( cItemL ) == ".c" .OR. ; hb_FNameExt( cItemL ) == ".m" @@ -10225,8 +10216,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile ) ELSEIF Lower( cExt ) == ".cpp" .OR. ; Lower( cExt ) == ".cc" .OR. ; Lower( cExt ) == ".cxx" .OR. ; - Lower( cExt ) == ".cx" .OR. ; - _EXT_IS_UPPER( cExt, ".C" ) + Lower( cExt ) == ".cx" /* do nothing */ ELSEIF ! Empty( cExecNM := FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "nm" ) ) cFuncList := ""