From 1c1b03b932a3e77db8cdcf3936718cd8e57facc0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 14 Sep 2012 19:11:44 +0000 Subject: [PATCH] 2012-09-14 21:07 UTC+0200 Firstname Lastname (me domain.net) * utils/hbmk2/hbmk2.prg * hbmk_OutStdRaw() and hb_OutErrRaw() hbmk2 plugin API functions parameter list modified so that now they expect hbmk context as first parameter. INCOMPATIBLE. ! made sure that hbmk_OutStdRaw() and hbmk_OutErrRaw() won't emit output in --hbinfo mode. * contrib/hbqt/hbmk2_qt.hb * utils/hbmk2/examples/plug_bis.hb * updated as per above incompatible change * contrib/make.hb * minor --- harbour/ChangeLog | 18 ++++++++++++- harbour/contrib/hbqt/hbmk2_qt.hb | 12 ++++----- harbour/contrib/make.hb | 6 ++--- harbour/utils/hbmk2/examples/plug_bis.hb | 4 +-- harbour/utils/hbmk2/hbmk2.prg | 32 +++++++++++------------- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 10b498a11e..92101651e4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-14 21:07 UTC+0200 Firstname Lastname (me domain.net) + * utils/hbmk2/hbmk2.prg + * hbmk_OutStdRaw() and hb_OutErrRaw() hbmk2 plugin + API functions parameter list modified so that now they + expect hbmk context as first parameter. + INCOMPATIBLE. + ! made sure that hbmk_OutStdRaw() and hbmk_OutErrRaw() + won't emit output in --hbinfo mode. + + * contrib/hbqt/hbmk2_qt.hb + * utils/hbmk2/examples/plug_bis.hb + * updated as per above incompatible change + + * contrib/make.hb + * minor + 2012-09-14 17:13 UTC+0200 Viktor Szakats (harbour syenar.net) * extras/hbvpdf/hbvpdft.prg ! missing #define LEFTEQUAL() @@ -31,7 +47,7 @@ ! further steps made that stray output is minimized in --hbinfo mode. (though some raw plugin API call may still generate output, it's yet to be done, and it will - API compatibility breakage in few calls) + API compatibility breakage in few calls) [DONE] 2012-09-14 15:43 UTC+0200 Viktor Szakats (harbour syenar.net) * INSTALL diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 1acb985528..ba69eec866 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -207,14 +207,14 @@ FUNCTION hbmk_plugin_qt( hbmk ) IF ! hbmk[ "lQUIET" ] hbmk_OutStd( hbmk, I_( "'rcc' command:" ) ) ENDIF - hbmk_OutStdRaw( cCommand ) + hbmk_OutStdRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lDONTEXEC" ] IF ( nError := hb_processRun( cCommand ) ) != 0 hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running 'rcc' executable. %1$d" ), nError ) ) IF ! hbmk[ "lQUIET" ] - hbmk_OutErrRaw( cCommand ) + hbmk_OutErrRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lIGNOREERROR" ] cRetVal := "error" @@ -272,14 +272,14 @@ FUNCTION hbmk_plugin_qt( hbmk ) IF ! hbmk[ "lQUIET" ] hbmk_OutStd( hbmk, I_( "'uic' command:" ) ) ENDIF - hbmk_OutStdRaw( cCommand ) + hbmk_OutStdRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lDONTEXEC" ] IF ( nError := hb_processRun( cCommand ) ) != 0 hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running 'uic' executable. %1$d" ), nError ) ) IF ! hbmk[ "lQUIET" ] - hbmk_OutErrRaw( cCommand ) + hbmk_OutErrRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lIGNOREERROR" ] FErase( cTmp ) @@ -366,13 +366,13 @@ FUNCTION hbmk_plugin_qt( hbmk ) IF ! hbmk[ "lQUIET" ] hbmk_OutStd( hbmk, I_( "'moc' command:" ) ) ENDIF - hbmk_OutStdRaw( cCommand ) + hbmk_OutStdRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lDONTEXEC" ] .AND. ( nError := hb_processRun( cCommand ) ) != 0 hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running 'moc' executable. %1$d" ), nError ) ) IF ! hbmk[ "lQUIET" ] - hbmk_OutErrRaw( cCommand ) + hbmk_OutErrRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lIGNOREERROR" ] cRetVal := "error" diff --git a/harbour/contrib/make.hb b/harbour/contrib/make.hb index 2ef4d8a2f4..ed494f11bc 100755 --- a/harbour/contrib/make.hb +++ b/harbour/contrib/make.hb @@ -1,4 +1,4 @@ -#!/usr/bin/hbmk2 +#!/usr/bin/hbrun --hb:gtcgi /* * $Id$ */ @@ -261,8 +261,8 @@ PROCEDURE GNUMake( aParams, hProjectList ) AScanL( aGNUMakeParams, "install" ) > AScanL( aGNUMakeParams, "clean" ) /* Use rebuild mode. This is needed because the clean phase might not have been called previously by GNU Make, f.e. - because hbmk2 wasn't available. -rebuildall is costless, - so we do it to make sure to build cleanly. + because hbrun or hbmk2 wasn't available. -rebuildall is + costless, so we do it to make sure to build cleanly. [vszakats] */ nAction := _ACT_INC_REBUILD_INST ELSE diff --git a/harbour/utils/hbmk2/examples/plug_bis.hb b/harbour/utils/hbmk2/examples/plug_bis.hb index 82abc442f4..8107e64aba 100644 --- a/harbour/utils/hbmk2/examples/plug_bis.hb +++ b/harbour/utils/hbmk2/examples/plug_bis.hb @@ -125,13 +125,13 @@ FUNCTION hbmk_plugin_bison( hbmk ) IF ! hbmk[ "lQUIET" ] hbmk_OutStd( hbmk, I_( "'bison' command:" ) ) ENDIF - hbmk_OutStdRaw( cCommand ) + hbmk_OutStdRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lDONTEXEC" ] .AND. ( nError := hb_processRun( cCommand ) ) != 0 hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running 'bison' executable. %1$s" ), hb_ntos( nError ) ) ) IF ! hbmk[ "lQUIET" ] - hbmk_OutErrRaw( cCommand ) + hbmk_OutErrRaw( hbmk, cCommand ) ENDIF IF ! hbmk[ "lIGNOREERROR" ] cRetVal := "error" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0691ae4d4c..b8801af7db 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -8744,24 +8744,6 @@ FUNCTION hbmk_FNameEscape( ... ) ; RETURN FNameEscape( ... ) FUNCTION hbmk_FNameToSymbol( ... ) ; RETURN FuncNameEncode( ... ) FUNCTION hbmk_StrStripQuote( ... ) ; RETURN StrStripQuote( ... ) -FUNCTION hbmk_OutStdRaw( ... ) -#if 0 - LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk == NIL .OR. hbmk[ _HBMK_lDumpInfo ] - RETURN NIL - ENDIF -#endif - RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) ) - -FUNCTION hbmk_OutErrRaw( ... ) -#if 0 - LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk == NIL .OR. hbmk[ _HBMK_lDumpInfo ] - RETURN NIL - ENDIF -#endif - RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) ) - FUNCTION hbmk_ArrayToList( array, cSeparator ) LOCAL cString := "" LOCAL tmp @@ -8789,6 +8771,20 @@ STATIC FUNCTION ctx_to_hbmk( ctx ) ENDIF RETURN NIL +FUNCTION hbmk_OutStdRaw( ctx, ... ) + LOCAL hbmk := ctx_to_hbmk( ctx ) + IF hbmk == NIL .OR. hbmk[ _HBMK_lDumpInfo ] + RETURN NIL + ENDIF + RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) ) + +FUNCTION hbmk_OutErrRaw( ctx, ... ) + LOCAL hbmk := ctx_to_hbmk( ctx ) + IF hbmk == NIL .OR. hbmk[ _HBMK_lDumpInfo ] + RETURN NIL + ENDIF + RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) ) + FUNCTION hbmk_PathFromWorkdirToCWD( ctx ) LOCAL hbmk := ctx_to_hbmk( ctx ) IF hbmk != NIL