From 71a0a02cf196987c104e5c622f1686bad34bc88a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 17 Feb 2009 14:45:31 +0000 Subject: [PATCH] 2009-02-17 15:45 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk/hbmk.prg + Added autodetection of -cc, -cmp options based on argv[0]. --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk/hbmk.prg | 24 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 51a27eae7b..1076f9a02d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-17 15:45 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk/hbmk.prg + + Added autodetection of -cc, -cmp options based on argv[0]. + 2009-02-17 15:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk/hbmk.prg + Added support for multiple -L (lib path) options. diff --git a/harbour/utils/hbmk/hbmk.prg b/harbour/utils/hbmk/hbmk.prg index 2a15d36c69..125c7e6c73 100644 --- a/harbour/utils/hbmk/hbmk.prg +++ b/harbour/utils/hbmk/hbmk.prg @@ -199,6 +199,21 @@ FUNCTION Main( ... ) ShowHeader() ENDIF + SWITCH Lower( NameGet( hb_argv( 0 ) ) ) + CASE "hbcc" + lStopAfterHarbour := .T. + IF ! t_lQuiet + OutStd( "hbmk: Enabled -cc option." + hb_osNewLine() ) + ENDIF + EXIT + CASE "hbcmp" + lStopAfterCComp := .T. + IF ! t_lQuiet + OutStd( "hbmk: Enabled -cmp option." + hb_osNewLine() ) + ENDIF + EXIT + ENDSWITCH + /* Autodetect architecture */ t_cARCH := GetEnv( "HB_ARCHITECTURE" ) @@ -466,7 +481,7 @@ FUNCTION Main( ... ) CASE Lower( cParam ) == "-trace-" ; s_lTRACE := .F. CASE Lower( cParam ) == "-notrace" ; s_lTRACE := .F. CASE Lower( cParam ) == "-cc" ; lStopAfterHarbour := .T. - CASE Lower( cParam ) == "-cmp" ; lStopAfterCComp := .T. + CASE Lower( cParam ) == "-cmp" ; lStopAfterCComp := .T. ; lStopAfterHarbour := .F. CASE Lower( Left( cParam, 3 ) ) == "-gt" ; DEFAULT s_cGT TO SubStr( cParam, 2 ) CASE Left( cParam, 2 ) == "-o" ; s_cPROGNAME := DirAdaptPathSep( SubStr( cParam, 3 ) ) CASE Left( cParam, 2 ) == "-l" .AND. ; @@ -1133,6 +1148,13 @@ STATIC FUNCTION DirAddPathSep( cDir ) RETURN cDir +STATIC FUNCTION NameGet( cFileName ) + LOCAL cName + + hb_FNameSplit( cFileName,, @cName ) + + RETURN cName + STATIC FUNCTION ExtSet( cFileName, cExt ) LOCAL cDir, cName