From 5f33ef7f7dd80f9a0968dd18a826d4854524f7bb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Aug 2008 12:26:19 +0000 Subject: [PATCH] 2008-08-29 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmake/hbmake.prg ; Applied patch created by Bill Robertson: * The following functions aren't used in hbmake and were removed: FindCfile(), TestforPrg(), AsDll(), ExtenPrg(), GetMakeDir() --- harbour/ChangeLog | 8 ++- harbour/utils/hbmake/hbmake.prg | 104 -------------------------------- 2 files changed, 7 insertions(+), 105 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f5e31fd1ce..4234ed2cbc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-29 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmake/hbmake.prg + ; Applied patch created by Bill Robertson: + * The following functions aren't used in hbmake and were removed: + FindCfile(), TestforPrg(), AsDll(), ExtenPrg(), GetMakeDir() + 2008-08-29 11:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbcompdf.h * harbour/source/compiler/hbmain.c @@ -26,7 +32,7 @@ * bin/postinst.sh * source/vm/Makefile * Renamed 'cemgw' HB_COMPILER name to 'mingwce' - for consitency. + for consistency. 2008-08-29 10:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 7709ed8a2a..58c042a0c6 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -4804,15 +4804,6 @@ FUNCTION SetBuildLib( nFHandle ) RETURN NIL -*--------------------------------- -FUNCTION FindCfile( citem, aSrcc ) -*--------------------------------- - LOCAL nReturnPos := 0 - - nReturnPos := AScan( aSrcc, { | x | Lower( x[ 1 ] ) == cItem } ) - -RETURN nReturnPos - *---------------------------- FUNCTION CheckIFfile( nFHandle, cFile ) *---------------------------- @@ -5147,41 +5138,6 @@ FUNCTION FindHarbourCfg( cCfg ) RETURN lFound -*--------------------------- -FUNCTION TestforPrg( cFile ) -*--------------------------- - - LOCAL aFiles AS ARRAY := {} - LOCAL cPath AS STRING := "" - LOCAL cTest AS STRING := "" - LOCAL cDrive AS STRING := "" - LOCAL cExt AS STRING := "" - LOCAL cItem AS STRING := "" - LOCAL aDir AS ARRAY - LOCAL nPos AS NUMERIC - LOCAL nFiles AS NUMERIC - - hb_FNAMESPLIT( cFile, @cPath, @cTest, @cExt, @cDrive ) - - cExt := Substr( cExt, 2 ) - aDir := Directory( cTest + ".*" ) - - FOR nPos := 1 TO 7 - cItem := cTest + "." + Extenprg( cExt, nPos ) - AAdd( aFiles, cItem ) - NEXT - - FOR nFiles := 1 TO Len( aFiles ) - nPos := AScan( aDir, { | a | a[ 1 ] == aFiles[ nFiles ] } ) - - IF nPos > 0 - AAdd( s_aPrgs, aFiles[ nFiles ] ) - ENDIF - - NEXT - -RETURN NIL - *------------------- FUNCTION GetGccDir() *------------------- @@ -5326,7 +5282,6 @@ FUNCTION ConvertParams( cFile, aFile, p1, p2, p3, p4, p5, p6 ) RETURN cParam - *------------------------------------ FUNCTION ProcessParameters( cParams ) *------------------------------------ @@ -5738,7 +5693,6 @@ LOCAL aLang := Array( 67 ) RETURN aLang - *------------------------------------------ FUNCTION GetSelFiles( aInFiles, aOutFiles ) *------------------------------------------ @@ -5842,13 +5796,6 @@ next RETURN c -*---------------- -FUNCTION AsDll(x) -*---------------- -LOCAL y := x - x := !y -RETURN .T. - *-------------------- FUNCTION Delete_ppo() *-------------------- @@ -6747,44 +6694,6 @@ FUNCTION GetSourceFiles( lSubDir, lGcc, cOs ) RETURN aRet -*------------------------------- -FUNCTION ExtenPrg( cExt, nType ) -*------------------------------- - - LOCAL aExt := { "C", "c" } - LOCAL nPos - LOCAL cTemp := "" - - nPos := ASCAN( aExt, { | a | a == cExt } ) - - IF nPos > 0 - SWITCH nType - CASE 1 - cTemp := STRTRAN( cExt, aExt[ nPos ], "prg" ) - EXIT - CASE 2 - cTemp := STRTRAN( cExt, aExt[ nPos ], "prG" ) - EXIT - CASE 3 - cTemp := STRTRAN( cExt, aExt[ nPos ], "pRg" ) - EXIT - CASE 4 - cTemp := STRTRAN( cExt, aExt[ nPos ], "Prg" ) - EXIT - CASE 5 - cTemp := STRTRAN( cExt, aExt[ nPos ], "PRg" ) - EXIT - CASE 6 - cTemp := STRTRAN( cExt, aExt[ nPos ], "PrG" ) - EXIT - CASE 7 - cTemp := STRTRAN( cExt, aExt[ nPos ], "PRG" ) - EXIT - END - ENDIF - - RETURN cTemp - *---------------------------------------- STATIC FUNCTION GetDirs( cPattern, lGcc ) *---------------------------------------- @@ -6921,19 +6830,6 @@ FUNCTION Exten( cExt, nType ) RETURN cTemp -*-------------------- -FUNCTION GetMakeDir() -*-------------------- - - LOCAL cPath := "" - LOCAL cExe := HB_ARGV( 0 ) - - cExe := STRTRAN( cExe, "/", "\" ) - cPath := LEFT( cexe, RAT( "\", cexe ) - 1 ) - cPath := LEFT( cPath, RAT( "\", cPath ) - 1 ) - - RETURN cPath - *---------------------------- FUNCTION GetSourceDirMacros() *----------------------------