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

2009-02-24 16:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed last minute typo.
This commit is contained in:
Viktor Szakats
2009-02-24 15:55:00 +00:00
parent 11acb420e2
commit 8a4c51e39f
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -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

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

@@ -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