From 8a4c51e39f3d6bccb9691c75a3e3339d39ae447e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 24 Feb 2009 15:55:00 +0000 Subject: [PATCH] 2009-02-24 16:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed last minute typo. --- harbour/ChangeLog | 4 +++ harbour/utils/hbmk2/hbmk2.prg | 59 ++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 98818b7556..d5dadc80af 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-24 16:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed last minute typo. + 2009-02-24 15:07 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg * utils/hbmk2/Makefile diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0e06ebe3b2..09f46c8f8e 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -842,42 +842,43 @@ FUNCTION Main( ... ) IF Len( s_aPRG ) > 0 #if defined( HBMK_INTEGRATED_COMPILER ) - aCommand := ArrayAJoin( { s_aPRG,; - { "-i" + s_cHB_INC_INSTALL },; - ListToArray( cSelfFlagPRG ),; - ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; - s_aOPTPRG } ) + aCommand := ArrayAJoin( { s_aPRG,; + { "-i" + s_cHB_INC_INSTALL },; + ListToArray( cSelfFlagPRG ),; + ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; + s_aOPTPRG } ) - IF s_lTRACE - OutStd( "hbmk: Harbour compiler command:" + hb_osNewLine() + ArrayToList( aCommand ) + hb_osNewLine() ) - ENDIF + IF s_lTRACE + OutStd( "hbmk: Harbour compiler command:" + hb_osNewLine() + ArrayToList( aCommand ) + hb_osNewLine() ) + ENDIF - IF ( tmp := hb_compile( "", aCommand ) ) != 0 - OutErr( "hbmk: Error: Running Harbour compiler. " + hb_ntos( tmp ) + hb_osNewLine() + ArrayToList( aCommand ) + hb_osNewLine() ) - PauseForKey() - RETURN 6 - ENDIF + IF ( tmp := hb_compile( "", aCommand ) ) != 0 + OutErr( "hbmk: Error: Running Harbour compiler. " + hb_ntos( tmp ) + hb_osNewLine() + ArrayToList( aCommand ) + hb_osNewLine() ) + PauseForKey() + RETURN 6 + ENDIF #else - cCommand := DirAddPathSep( s_cHB_BIN_INSTALL ) +; - cBin_CompPRG +; - " " + ArrayToList( s_aPRG ) +; - " -i" + s_cHB_INC_INSTALL +; - iif( s_lBLDFLGP, " " + cSelfFlagPRG, "" ) +; - iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +; - iif( ! Empty( s_aOPTPRG ), " " + ArrayToList( s_aOPTPRG ), "" ) + cCommand := DirAddPathSep( s_cHB_BIN_INSTALL ) +; + cBin_CompPRG +; + " " + ArrayToList( s_aPRG ) +; + " -i" + s_cHB_INC_INSTALL +; + iif( s_lBLDFLGP, " " + cSelfFlagPRG, "" ) +; + iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +; + iif( ! Empty( s_aOPTPRG ), " " + ArrayToList( s_aOPTPRG ), "" ) - cCommand := AllTrim( cCommand ) + cCommand := AllTrim( cCommand ) - IF s_lTRACE - OutStd( "hbmk: Harbour compiler command:" + hb_osNewLine() + cCommand + hb_osNewLine() ) - ENDIF + IF s_lTRACE + OutStd( "hbmk: Harbour compiler command:" + hb_osNewLine() + cCommand + hb_osNewLine() ) + ENDIF - IF ( tmp := hb_run( cCommand ) ) != 0 - OutErr( "hbmk: Error: Running Harbour compiler. " + hb_ntos( tmp ) + ":" + hb_osNewLine() + cCommand + hb_osNewLine() ) - PauseForKey() - RETURN 6 - ENDIF + IF ( tmp := hb_run( cCommand ) ) != 0 + OutErr( "hbmk: Error: Running Harbour compiler. " + hb_ntos( tmp ) + ":" + hb_osNewLine() + cCommand + hb_osNewLine() ) + PauseForKey() + RETURN 6 + ENDIF #endif + ENDIF IF ! lStopAfterHarbour