From a3b894835464d16b566ef3bae1b2268b6205d0da Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 21 May 2009 10:24:57 +0000 Subject: [PATCH] 2009-05-21 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg - Removed file extension retaining hack for win platforms. Please be aware that *.prg means *.prg* on Windows platforms. --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 15 +-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c7613a6844..802d1bbe6a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-21 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + - Removed file extension retaining hack for win platforms. + Please be aware that *.prg means *.prg* on Windows platforms. + 2009-05-21 11:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/filebuf.c ! refuse to share file handles if they were open in different mode diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a86efd94e6..2622c99f18 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -4357,9 +4357,6 @@ STATIC FUNCTION FN_Expand( cFileName, lCommandLine ) LOCAL aFileList LOCAL aFile LOCAL aDir -#if defined( __PLATFORM__WINDOWS ) - LOCAL cExt -#endif #if defined( __PLATFORM__UNIX ) /* Disable expansion if this came from the command line */ @@ -4376,19 +4373,9 @@ STATIC FUNCTION FN_Expand( cFileName, lCommandLine ) aFileList := {} -#if defined( __PLATFORM__WINDOWS ) - cExt := FN_ExtGet( cFileName ) -#endif aDir := Directory( cFileName ) FOR EACH aFile IN aDir -#if defined( __PLATFORM__WINDOWS ) - /* Workaround to not find 'hello.prga' when looking for '*.prg' */ - IF Lower( FN_ExtGet( aFile[ F_NAME ] ) ) == Lower( cExt ) -#endif - AAdd( aFilelist, hb_FNameMerge( FN_DirGet( cFileName ), aFile[ F_NAME ] ) ) -#if defined( __PLATFORM__WINDOWS ) - ENDIF -#endif + AAdd( aFilelist, hb_FNameMerge( FN_DirGet( cFileName ), aFile[ F_NAME ] ) ) NEXT RETURN aFileList