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

2010-05-24 18:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * utils/hbmk2/examples/plug_moc.prg
    * Minor cleanups to plugin API.

  * src/rtl/typefile.prg
    ! Typo in comment.
This commit is contained in:
Viktor Szakats
2010-05-24 16:45:51 +00:00
parent ccc18d5011
commit e8aec4dff4
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-24 18:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* utils/hbmk2/examples/plug_moc.prg
* Minor cleanups to plugin API.
* src/rtl/typefile.prg
! Typo in comment.
2010-05-24 15:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Upped warning level for plugins to -w3.

2
harbour/src/rtl/typefile.prg
View File

@@ -139,7 +139,7 @@ PROCEDURE __TypeFile( cFile, lPrint )
/* Here we try to read a line at a time but I think we could just
display the whole buffer since it said:
"without any headings or formating" */
"without any headings or formatting" */
nHasRead := 0
cBuffer := Space( nBuffer )

15
harbour/utils/hbmk2/examples/plug_moc.prg
View File

@@ -9,7 +9,6 @@
* See COPYING for licensing terms.
*/
#define _OUT_EOL Chr( 10 )
#define I_( x ) hb_i18n_gettext( x )
FUNCTION hbmk2_plugin_moc( hbmk2 )
@@ -35,7 +34,7 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
aMOC := {}
FOR EACH tmp IN hbmk2[ "params" ]
IF Lower( hbmk2_FN_ExtGet( tmp ) ) $ ".h|.hpp"
IF Lower( hbmk2_FNameExtGet( tmp ) ) $ ".h|.hpp"
AAdd( aMOC, tmp )
ENDIF
NEXT
@@ -79,7 +78,7 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
FOR EACH tmp IN aMOC
cDst := hbmk2_FN_DirExtSet( "moc_" + tmp, hbmk2[ "cWorkDir" ], ".cpp" )
cDst := hbmk2_FNameDirExtSet( "moc_" + tmp, hbmk2[ "cWorkDir" ], ".cpp" )
IF hbmk2[ "lINC" ] .AND. ! hbmk2[ "lREBUILD" ]
lBuildIt := ! hb_FGetDateTime( cDst, @tmp2 ) .OR. ;
@@ -91,20 +90,20 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
IF lBuildIt
cCommand := cMOC_BIN +;
" " + hbmk2_FN_Escape( hbmk2_PathSepToTarget( hbmk2, tmp ), hbmk2[ "nCmd_Esc" ] ) +;
" -o " + hbmk2_FN_Escape( hbmk2_PathSepToTarget( hbmk2, cDst ), hbmk2[ "nCmd_Esc" ] )
" " + hbmk2_FNameEscape( hbmk2_PathSepToTarget( hbmk2, tmp ), hbmk2[ "nCmd_Esc" ] ) +;
" -o " + hbmk2_FNameEscape( hbmk2_PathSepToTarget( hbmk2, cDst ), hbmk2[ "nCmd_Esc" ] )
IF hbmk2[ "lTRACE" ]
IF ! hbmk2[ "lQUIET" ]
hbmk2_OutStd( hbmk2, I_( "'moc' command:" ) )
ENDIF
OutStd( cCommand + _OUT_EOL )
hbmk2_OutStdRaw( cCommand )
ENDIF
IF ! hbmk2[ "lDONTEXEC" ] .AND. ( nError := hb_processRun( cCommand ) ) != 0
hbmk2_OutErr( hbmk2, hb_StrFormat( I_( "Error: Running 'moc' executable. %1$s" ), hb_ntos( nError ) ) )
IF ! hbmk2[ "lQUIET" ]
OutErr( cCommand + _OUT_EOL )
hbmk2_OutErrRaw( cCommand )
ENDIF
IF ! hbmk2[ "lIGNOREERROR" ]
cRetVal := "error"
@@ -131,6 +130,8 @@ FUNCTION hbmk2_plugin_moc( hbmk2 )
AEval( hbmk2[ "vars" ][ "aMOC_Dst" ], {| tmp | FErase( tmp ) } )
ENDIF
EXIT
ENDSWITCH
RETURN cRetVal

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

@@ -5923,18 +5923,17 @@ FUNCTION hbmk2_DirAddPathSep( ... ) ; RETURN DirAddPathSep( ... )
FUNCTION hbmk2_DirDelPathSep( ... ) ; RETURN DirDelPathSep( ... )
FUNCTION hbmk2_DirBuild( ... ) ; RETURN DirBuild( ... )
FUNCTION hbmk2_DirUnbuild( ... ) ; RETURN DirUnbuild( ... )
FUNCTION hbmk2_FN_DirGet( ... ) ; RETURN FN_DirGet( ... )
FUNCTION hbmk2_FN_DirExtSet( ... ) ; RETURN FN_DirExtSet( ... )
FUNCTION hbmk2_FN_NameGet( ... ) ; RETURN FN_NameGet( ... )
FUNCTION hbmk2_FN_NameExtGet( ... ) ; RETURN FN_NameExtGet( ... )
FUNCTION hbmk2_FN_ExtGet( ... ) ; RETURN FN_ExtGet( ... )
FUNCTION hbmk2_FN_ExtDef( ... ) ; RETURN FN_ExtDef( ... )
FUNCTION hbmk2_FN_ExtSet( ... ) ; RETURN FN_ExtSet( ... )
FUNCTION hbmk2_FN_Escape( ... ) ; RETURN FN_Escape( ... )
FUNCTION hbmk2_FNameDirGet( ... ) ; RETURN FN_DirGet( ... )
FUNCTION hbmk2_FNameDirExtSet( ... ) ; RETURN FN_DirExtSet( ... )
FUNCTION hbmk2_FNameNameGet( ... ) ; RETURN FN_NameGet( ... )
FUNCTION hbmk2_FNameNameExtGet( ... ) ; RETURN FN_NameExtGet( ... )
FUNCTION hbmk2_FNameExtGet( ... ) ; RETURN FN_ExtGet( ... )
FUNCTION hbmk2_FNameExtDef( ... ) ; RETURN FN_ExtDef( ... )
FUNCTION hbmk2_FNameExtSet( ... ) ; RETURN FN_ExtSet( ... )
FUNCTION hbmk2_FNameEscape( ... ) ; RETURN FN_Escape( ... )
FUNCTION hbmk2_StrStripQuote( ... ) ; RETURN StrStripQuote( ... )
FUNCTION hbmk2_PathSepToTarget( ctx, ... )
RETURN PathSepToTarget( ctx[ s_cSecToken ], ... )
FUNCTION hbmk2_OutStdRaw( ... ) ; RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) )
FUNCTION hbmk2_OutErrRaw( ... ) ; RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) )
FUNCTION hbmk2_OutStd( ctx, cText )
RETURN hbmk_OutStd( ctx[ s_cSecToken ], hb_StrFormat( I_( "plugin: %1$s" ), cText ) )
@@ -5942,6 +5941,9 @@ FUNCTION hbmk2_OutStd( ctx, cText )
FUNCTION hbmk2_OutErr( ctx, cText )
RETURN hbmk_OutErr( ctx[ s_cSecToken ], hb_StrFormat( I_( "plugin: %1$s" ), cText ) )
FUNCTION hbmk2_PathSepToTarget( ctx, ... )
RETURN PathSepToTarget( ctx[ s_cSecToken ], ... )
FUNCTION hbmk2_AddInput_PRG( ctx, cFileName )
AAdd( ctx[ s_cSecToken ][ _HBMK_aPRG ], cFileName )
RETURN NIL
@@ -5962,14 +5964,14 @@ FUNCTION hbmk2_AddInput_RC( ctx, cFileName )
STATIC FUNCTION PlugIn_Execute( hbmk, cState )
LOCAL cHRB
LOCAL hContext
LOCAL ctx
LOCAL xResult
LOCAL oError
IF ! Empty( hbmk[ _HBMK_hPLUGINHRB ] )
hContext := {;
ctx := {;
"cSTATE" => cState ,;
"params" => hbmk[ _HBMK_aPLUGINPars ] ,;
"vars" => hbmk[ _HBMK_hPLUGINVars ] ,;
@@ -5996,7 +5998,7 @@ STATIC FUNCTION PlugIn_Execute( hbmk, cState )
FOR EACH cHRB IN hbmk[ _HBMK_hPLUGINHRB ]
BEGIN SEQUENCE WITH {| oError | oError:cargo := { ProcName( 1 ), ProcLine( 1 ) }, Break( oError ) }
xResult := hb_hrbRun( HB_HRB_BIND_FORCELOCAL, cHRB, hContext )
xResult := hb_hrbRun( HB_HRB_BIND_FORCELOCAL, cHRB, ctx )
IF ! Empty( xResult )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Plugin %1$s returned: '%2$s'" ), cHRB:__enumKey(), xResult ) )