From 4527d4ab372932f9bc5e4ef9dfc5586b46532abc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 Jan 2010 14:48:53 +0000 Subject: [PATCH] 2010-01-26 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added -hbexe option. This is the default, but it may help hbide and other tools to clear doubts about target type. (or to override some previous -hbdyn/-hblib options for whatever reasons) * contrib/hbide/ideprojmanager.prg * "hbMK2.exe" -> "hbmk2 Executable" .exe extension is Win/OS2/DOS specific. --- harbour/ChangeLog | 14 ++++++++++++-- harbour/contrib/hbide/ideprojmanager.prg | 2 +- harbour/utils/hbmk2/hbmk2.prg | 4 ++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 65db35b188..49b3b95789 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-26 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Added -hbexe option. This is the default, but it may help hbide + and other tools to clear doubts about target type. (or to override + some previous -hbdyn/-hblib options for whatever reasons) + + * contrib/hbide/ideprojmanager.prg + * "hbMK2.exe" -> "hbmk2 Executable" + .exe extension is Win/OS2/DOS specific. + 2010-01-26 15:21 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbmk2/hbmk2.prg * use HB_EXTERN_BEGIN / HB_EXTERN_END macros instead of HB_EXTERN_C @@ -27,8 +37,8 @@ * utils/hbmk2/hbmk2.pt_BR.po * utils/hbmk2/hbmk2.prg ! Fixed rare problem where options containing .hbp/.hbm/.clp - extesions have been mistaken as file recursions instead - of being processes as options. F.e. -runflag=test.hbp + extensions have been mistaken as file recursions instead + of being processed as options. F.e. '-runflag=test.hbp' ! Updated help text about possible filter keywords. ! Fixed to use xharbour[mt] for dynlib name for mingw targets. Added NOTE that in newer xhb version this is not true diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 22e79211b5..8692ec33d3 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -848,7 +848,7 @@ METHOD IdeProjManager:manageEnvironments() ::oUI:signal( "buttonSave" , "clicked()", {|| ::saveEnvironments() } ) ::oUI:signal( "buttonSaveExit" , "clicked()", {|| ::saveEnvironments(), ::oUI:oWidget:close() } ) * ::oUI:signal( "buttonSaveEnv" , "clicked()", {|| ::saveEnvironments() } ) - ::oUI:signal( "buttonPathMk2" , "clicked()", {|| ::PromptForPath( 'editPathMk2' , 'Choose hbMK2.exe Folder...' ) } ) + ::oUI:signal( "buttonPathMk2" , "clicked()", {|| ::PromptForPath( 'editPathMk2' , 'Choose hbmk2 Executable Folder...' ) } ) ::oUI:signal( "buttonPathEnv" , "clicked()", {|| ::PromptForPath( 'editPathEnv' , 'Choose hbIDE.env Folder...' ), ; ::oUI:q_editCompilers:setPlainText( hb_memoread( hbide_pathFile( ::oUI:q_editPathEnv:text(), "hbide.env" ) ) ) } ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3569bc71b5..3e2c7e58a3 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -396,6 +396,8 @@ PROCEDURE Main( ... ) CASE tmp == "rtlink" .OR. ; tmp == "exospace" .OR. ; tmp == "blinker" ; AAdd( aArgsProc, "-rtlink" ) + CASE Right( tmp, 5 ) == "hbexe" .OR. ; + Left( tmp, 5 ) == "hbexe" ; AAdd( aArgsProc, "-hbexe" ) CASE Right( tmp, 5 ) == "hblib" .OR. ; Left( tmp, 5 ) == "hblib" ; AAdd( aArgsProc, "-hblib" ) CASE Right( tmp, 5 ) == "hbdyn" .OR. ; @@ -1570,6 +1572,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) CASE cParamL == "-quiet" ; hbmk[ _HBMK_lQuiet ] := .T. ; hbmk[ _HBMK_lInfo ] := .F. CASE cParamL == "-info" ; hbmk[ _HBMK_lInfo ] := .T. CASE cParamL == "-pause" ; lPause := .T. + CASE cParamL == "-hbexe" ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .F. ; hbmk[ _HBMK_lCreateLib ] := .F. ; hbmk[ _HBMK_lCreateDyn ] := .F. CASE cParamL == "-hblib" ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .T. ; hbmk[ _HBMK_lCreateDyn ] := .F. CASE cParamL == "-hbdyn" ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; hbmk[ _HBMK_lCreateDyn ] := .T. CASE cParamL == "-gui" .OR. ; @@ -8132,6 +8135,7 @@ STATIC PROCEDURE ShowHelp( lLong ) { "-static|-shared" , I_( "link with static/shared libs" ) },; { "-mt|-st" , I_( "link with multi/single-thread VM" ) },; { "-gt" , I_( "link with GT GT driver, can be repeated to link with more GTs. First one will be the default at runtime" ) },; + { "-hbexe" , I_( "create executable (default)" ) },; { "-hblib" , I_( "create static library" ) },; { "-hbdyn" , I_( "create dynamic library" ) }}