From 576701d94f2b8a0b0a77ba56b8993c90ae7a6668 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Apr 2010 19:45:32 +0000 Subject: [PATCH] 2010-04-11 21:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + -info parameter will now enable output line with target filename. This is done by default in -inc mode, so to get it also in non -inc mode, just add -info to cmdline. This fixed target detection in HBIDE. --- harbour/ChangeLog | 7 +++++++ harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 299e804d88..5323ca97e4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-11 21:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + -info parameter will now enable output line with target + filename. This is done by default in -inc mode, so to get + it also in non -inc mode, just add -info to cmdline. + This fixed target detection in HBIDE. + 2010-04-11 21:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/ideprojmanager.prg ! Fixed to not ignore hbmk2 path as set in options or via envvar. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7caa5e01f8..7245dda4bf 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -4683,7 +4683,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) DO CASE CASE ! lStopAfterCComp .AND. ! Empty( cBin_Link ) - IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] + IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Linking... %1$s" ), PathSepToTarget( hbmk, l_cPROGNAME ) ) ) ENDIF @@ -4774,7 +4774,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateDyn ] .AND. ! Empty( cBin_Dyn ) - IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] + IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Creating dynamic library... %1$s" ), PathSepToTarget( hbmk, l_cPROGNAME ) ) ) ENDIF @@ -4838,7 +4838,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateLib ] .AND. ! Empty( cBin_Lib ) - IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] + IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Creating static library... %1$s" ), PathSepToTarget( hbmk, l_cPROGNAME ) ) ) ENDIF