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

2012-06-05 15:06 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + added all public plugin API function with "hbmk_" prefix.
      old "hbmk2_" prefixed ones still exist for compatibility,
      but it's recommended to change them. "hbmk2" is only used
      now as the tool's name, but internally it's uniformly 
      referred to as "hbmk".

  * utils/hbmk2/examples/plug_tpl.hb
    + most "hbmk2" converted to "hbmk"
This commit is contained in:
Viktor Szakats
2012-06-05 13:06:56 +00:00
parent c13165fee8
commit 0062d945d3
3 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-05 15:06 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ added all public plugin API function with "hbmk_" prefix.
old "hbmk2_" prefixed ones still exist for compatibility,
but it's recommended to change them. "hbmk2" is only used
now as the tool's name, but internally it's uniformly
referred to as "hbmk".
* utils/hbmk2/examples/plug_tpl.hb
+ most "hbmk2" converted to "hbmk"
2012-06-05 14:55 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
* utils/hbmk2/hbmk2.es_PE.po

16
harbour/utils/hbmk2/examples/plug_tpl.hb
View File

@@ -31,27 +31,27 @@
#pragma warninglevel=3
FUNCTION hbmk2_plugin_tpl( hbmk2 )
FUNCTION hbmk_plugin_tpl( hbmk )
LOCAL tmp
IF hbmk2[ "lTRACE" ]
hbmk2_OutStd( hbmk2, "@@ Entered plugin: " + hbmk2[ "cSTATE" ] )
IF hbmk[ "lTRACE" ]
hbmk_OutStd( hbmk, "@@ Entered plugin: " + hbmk[ "cSTATE" ] )
ENDIF
SWITCH hbmk2[ "cSTATE" ]
SWITCH hbmk[ "cSTATE" ]
CASE "pre_all"
FOR EACH tmp IN hbmk2[ "params" ]
hbmk2_OutStd( hbmk2, hb_StrFormat( "Parameter #%1$s: '%2$s'", hb_ntos( tmp:__enumIndex() ), tmp ) )
FOR EACH tmp IN hbmk[ "params" ]
hbmk_OutStd( hbmk, hb_StrFormat( "Parameter #%1$s: '%2$s'", hb_ntos( tmp:__enumIndex() ), tmp ) )
NEXT
EXIT
CASE "pre_c"
hbmk2[ "vars" ][ "MyVar" ] := "Hello world!"
hbmk[ "vars" ][ "MyVar" ] := "Hello world!"
EXIT
CASE "post_all"
hbmk2_OutStd( hbmk2, "POST_ALL: " + hbmk2[ "vars" ][ "MyVar" ] )
hbmk_OutStd( hbmk, "POST_ALL: " + hbmk[ "vars" ][ "MyVar" ] )
EXIT
ENDSWITCH

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

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* Harbour Make (alias hbmk, alias hbmk2)
* Harbour Make (alias hbmk/hbmk2)
*
* Copyright 1999-2012 Viktor Szakats (harbour syenar.net)
* www - http://harbour-project.org
@@ -8554,19 +8554,44 @@ STATIC PROCEDURE PlugIn_Load( hbmk, cFileName )
RETURN
/* Public functions accessible for plugins (compatibility) */
FUNCTION hbmk2_FindInPath( ... ) ; RETURN hbmk_FindInPath( ... )
FUNCTION hbmk2_PathSepToForward( ... ) ; RETURN hbmk_PathSepToForward( ... )
FUNCTION hbmk2_PathSepToSelf( ... ) ; RETURN hbmk_PathSepToSelf( ... )
FUNCTION hbmk2_FNameDirExtSet( ... ) ; RETURN hbmk_FNameDirExtSet( ... )
FUNCTION hbmk2_FNameEscape( ... ) ; RETURN hbmk_FNameEscape( ... )
FUNCTION hbmk2_FNameToSymbol( ... ) ; RETURN hbmk_FNameToSymbol( ... )
FUNCTION hbmk2_StrStripQuote( ... ) ; RETURN hbmk_StrStripQuote( ... )
FUNCTION hbmk2_OutStdRaw( ... ) ; RETURN hbmk_OutStdRaw( ... )
FUNCTION hbmk2_OutErrRaw( ... ) ; RETURN hbmk_OutErrRaw( ... )
FUNCTION hbmk2_ArrayToList( ... ) ; RETURN hbmk_ArrayToList( ... )
FUNCTION hbmk2_PathFromWorkdirToCWD( ... ) ; RETURN hbmk_PathFromWorkdirToCWD( ... )
FUNCTION hbmk2_Macro( ... ) ; RETURN hbmk_Macro( ... )
FUNCTION hbmk2_OutStd( ... ) ; RETURN hbmk_OutStd( ... )
FUNCTION hbmk2_OutErr( ... ) ; RETURN hbmk_OutErr( ... )
FUNCTION hbmk2_PathSepToTarget( ... ) ; RETURN hbmk_PathSepToTarget( ... )
FUNCTION hbmk2_AddInput_PRG( ... ) ; RETURN hbmk_AddInput_PRG( ... )
FUNCTION hbmk2_AddInput_C( ... ) ; RETURN hbmk_AddInput_C( ... )
FUNCTION hbmk2_AddInput_CPP( ... ) ; RETURN hbmk_AddInput_CPP( ... )
FUNCTION hbmk2_AddInput_RC( ... ) ; RETURN hbmk_AddInput_RC( ... )
FUNCTION hbmk2_AddInput_OBJ( ... ) ; RETURN hbmk_AddInput_OBJ( ... )
FUNCTION hbmk2_AddInput_INSTFILE( ... ) ; RETURN hbmk_AddInput_INSTFILE( ... )
FUNCTION hbmk2_Register_Input_File_Extension( ... ) ; RETURN hbmk_Register_Input_File_Extension( ... )
/* Public functions accessible for plugins */
FUNCTION hbmk2_FindInPath( ... ) ; RETURN FindInPath( ... )
FUNCTION hbmk2_PathSepToForward( ... ) ; RETURN PathSepToForward( ... )
FUNCTION hbmk2_PathSepToSelf( ... ) ; RETURN PathSepToSelf( ... )
FUNCTION hbmk2_FNameDirExtSet( ... ) ; RETURN FNameDirExtSet( ... )
FUNCTION hbmk2_FNameEscape( ... ) ; RETURN FNameEscape( ... )
FUNCTION hbmk2_FNameToSymbol( ... ) ; RETURN FuncNameEncode( ... )
FUNCTION hbmk2_StrStripQuote( ... ) ; RETURN StrStripQuote( ... )
FUNCTION hbmk2_OutStdRaw( ... ) ; RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) )
FUNCTION hbmk2_OutErrRaw( ... ) ; RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) )
FUNCTION hbmk_FindInPath( ... ) ; RETURN FindInPath( ... )
FUNCTION hbmk_PathSepToForward( ... ) ; RETURN PathSepToForward( ... )
FUNCTION hbmk_PathSepToSelf( ... ) ; RETURN PathSepToSelf( ... )
FUNCTION hbmk_FNameDirExtSet( ... ) ; RETURN FNameDirExtSet( ... )
FUNCTION hbmk_FNameEscape( ... ) ; RETURN FNameEscape( ... )
FUNCTION hbmk_FNameToSymbol( ... ) ; RETURN FuncNameEncode( ... )
FUNCTION hbmk_StrStripQuote( ... ) ; RETURN StrStripQuote( ... )
FUNCTION hbmk_OutStdRaw( ... ) ; RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) )
FUNCTION hbmk_OutErrRaw( ... ) ; RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) )
FUNCTION hbmk2_ArrayToList( array, cSeparator )
FUNCTION hbmk_ArrayToList( array, cSeparator )
LOCAL cString := ""
LOCAL tmp
@@ -8593,42 +8618,42 @@ STATIC FUNCTION ctx_to_hbmk( ctx )
ENDIF
RETURN NIL
FUNCTION hbmk2_PathFromWorkdirToCWD( ctx )
FUNCTION hbmk_PathFromWorkdirToCWD( ctx )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN hb_DirSepAdd( hb_PathRelativize( hb_PathNormalize( PathMakeAbsolute( hbmk[ _HBMK_cWorkDir ], hb_cwd() ) ), hb_cwd(), .T. ) )
ENDIF
RETURN ""
FUNCTION hbmk2_Macro( ctx, cString )
FUNCTION hbmk_Macro( ctx, cString )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN MacroProc( hbmk, cString )
ENDIF
RETURN ""
FUNCTION hbmk2_OutStd( ctx, cText )
FUNCTION hbmk_OutStd( ctx, cText )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN hbmk_OutStd( hbmk, hb_StrFormat( I_( "plugin: %1$s" ), cText ) )
ENDIF
RETURN NIL
FUNCTION hbmk2_OutErr( ctx, cText )
FUNCTION hbmk_OutErr( ctx, cText )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN hbmk_OutErr( hbmk, hb_StrFormat( I_( "plugin: %1$s" ), cText ) )
ENDIF
RETURN NIL
FUNCTION hbmk2_PathSepToTarget( ctx, ... )
FUNCTION hbmk_PathSepToTarget( ctx, ... )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN PathSepToTarget( hbmk, ... )
ENDIF
RETURN ""
FUNCTION hbmk2_AddInput_PRG( ctx, cFileName )
FUNCTION hbmk_AddInput_PRG( ctx, cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
AAdd( hbmk[ _HBMK_aPRG ], PathSepToSelf( cFileName ) )
@@ -8636,7 +8661,7 @@ FUNCTION hbmk2_AddInput_PRG( ctx, cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_C( ctx, cFileName )
FUNCTION hbmk_AddInput_C( ctx, cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
AAdd( hbmk[ _HBMK_aC ], PathSepToSelf( cFileName ) )
@@ -8644,7 +8669,7 @@ FUNCTION hbmk2_AddInput_C( ctx, cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_CPP( ctx, cFileName )
FUNCTION hbmk_AddInput_CPP( ctx, cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
AAdd( hbmk[ _HBMK_aCPP ], PathSepToSelf( cFileName ) )
@@ -8652,21 +8677,21 @@ FUNCTION hbmk2_AddInput_CPP( ctx, cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_RC( ctx, cFileName )
FUNCTION hbmk_AddInput_RC( ctx, cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
AAdd( hbmk[ _HBMK_aRESSRC ], PathSepToSelf( cFileName ) )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_OBJ( ctx, cFileName )
FUNCTION hbmk_AddInput_OBJ( ctx, cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
AAdd( hbmk[ _HBMK_aOBJUSER ], PathSepToSelf( cFileName ) )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_INSTFILE( ctx, cFileName, cGroup )
FUNCTION hbmk_AddInput_INSTFILE( ctx, cFileName, cGroup )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cFileName )
IF ! HB_ISSTRING( cGroup )
@@ -8676,7 +8701,7 @@ FUNCTION hbmk2_AddInput_INSTFILE( ctx, cFileName, cGroup )
ENDIF
RETURN NIL
FUNCTION hbmk2_Register_Input_File_Extension( ctx, cExt )
FUNCTION hbmk_Register_Input_File_Extension( ctx, cExt )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. HB_ISSTRING( cExt )
IF ! Empty( cExt )