fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-04-20 16:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + -quiet will now suppress command output in case of error.
      This is useful when the commands are large and it makes
      valuable tool output visible.
    ! Fixed recent typos in help code causing RTE.
This commit is contained in:
Viktor Szakats
2009-04-20 14:37:32 +00:00
parent 379f03d5ed
commit bc447eb8f5
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-20 16:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
+ -quiet will now suppress command output in case of error.
This is useful when the commands are large and it makes
valuable tool output visible.
! Fixed recent typos in help code causing RTE.
2009-04-20 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Typo in 'allwin' filter handling.

40
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2350,7 +2350,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running Harbour compiler. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
RETURN 6
ENDIF
#endif
@@ -2538,7 +2540,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp1 := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running resource compiler. " + hb_ntos( tmp1 ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 6
EXIT
ENDIF
@@ -2575,7 +2579,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running resource compiler. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 8
ENDIF
@@ -2655,7 +2661,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp1 := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running C compiler. " + hb_ntos( tmp1 ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 6
EXIT
ENDIF
@@ -2694,7 +2702,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running C compiler. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 6
ENDIF
@@ -2811,7 +2821,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running linker. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 7
ENDIF
@@ -2864,7 +2876,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running lib command. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 7
ENDIF
@@ -2919,7 +2933,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Error: Running dynamic lib link command. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
nErrorLevel := 7
ENDIF
@@ -2985,7 +3001,9 @@ FUNCTION hbmk( aArgs )
IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
OutErr( "hbmk: Warning: Running compression command. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
OutErr( cCommand + hb_osNewLine() )
IF ! s_lQuiet
OutErr( cCommand + hb_osNewLine() )
ENDIF
ENDIF
ENDIF
@@ -4781,8 +4799,8 @@ STATIC PROCEDURE ShowHelp( lLong )
" Filter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined " ,;
" using '&', '|' operators and grouped by parantheses." ,;
" Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}," ,;
" {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}", ,;
" {allpocc}, {allgcc}, {allmingw}, {allmsvc}", ,;
" {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}" ,;
" {allpocc}, {allgcc}, {allmingw}, {allmsvc}" ,;
" - Certain .hbp lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=," ,;
" echo=) and corresponding command line parameters will accept macros:" ,;
" ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${<envvar>}" ,;