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

2012-09-14 21:07 UTC+0200 Firstname Lastname (me domain.net)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2012-09-14 19:11:44 +00:00
parent b6877a9a24
commit 1c1b03b932
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

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

12
harbour/contrib/hbqt/hbmk2_qt.hb
View File

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

6
harbour/contrib/make.hb
View File

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

4
harbour/utils/hbmk2/examples/plug_bis.hb
View File

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

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

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