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

2010-07-02 10:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added feature for plugins to register the file extensions
      they can handle. This makes -pi option unnecessary for
      passing special file types to the build process. File types
      handled by hbmk2 cannot be overridden this way, if you want
      to do such thing -pi option is required, this is by design,
      and this way plugins cannot inadvertently mess up the build
      process.
    + Added strict parameter checking to hbmk2 plugin functions
      which requires the hbmk2 context. Now calling them with bad
      parameters won't cause RTE inside hbmk2 code.

  * contrib/hbqt/hbmk2_plugin_qt.prg
    + Registering the file types the plugin can handle.

  * contrib/hbqt/hbqtcore.hbp
  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
  * contrib/hbqt/hbqtnetwork.hbp
  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
  * contrib/hbqt/hbqt.hbp
  * contrib/hbqt/hbqtgui.hbp
  * contrib/hbide/hbide.hbp
    - Dropped -pi option. It is now unnecessary in these cases
      (well, all cases in Harbour)

  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
    ! Fixed content. The referenced plugin name was deleted quite
      long ago already when this file was committed. Was this
      file ever tested before commit?

  + contrib/hbqt/tests/harbour-logo.png
  + contrib/hbqt/tests/harbour-icon.png
  + contrib/hbqt/tests/testres.prg
  + contrib/hbqt/tests/testres.qrc
    + Added example for QT resource embedding.
      Sent to the list by Bacco, with my cleanups, formatting,
      renames etc. I didn't add a .hbp file for it, so pls
      remember to build it using:
         'hbmk2 testres testres.qrc'
This commit is contained in:
Viktor Szakats
2010-07-03 08:47:53 +00:00
parent 43871fd1af
commit 1ff4a5ee13
15 changed files with 326 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
harbour/ChangeLog
View File

@@ -16,6 +16,48 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-02 10:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added feature for plugins to register the file extensions
they can handle. This makes -pi option unnecessary for
passing special file types to the build process. File types
handled by hbmk2 cannot be overridden this way, if you want
to do such thing -pi option is required, this is by design,
and this way plugins cannot inadvertently mess up the build
process.
+ Added strict parameter checking to hbmk2 plugin functions
which requires the hbmk2 context. Now calling them with bad
parameters won't cause RTE inside hbmk2 code.
* contrib/hbqt/hbmk2_plugin_qt.prg
+ Registering the file types the plugin can handle.
* contrib/hbqt/hbqtcore.hbp
* contrib/hbqt/qtwebkit/hbqtwebkit.hbp
* contrib/hbqt/hbqscintilla/hbqscintilla.hbp
* contrib/hbqt/hbqtnetwork.hbp
* contrib/hbqt/qtdesigner/hbqtdesigner.hbp
* contrib/hbqt/hbqt.hbp
* contrib/hbqt/hbqtgui.hbp
* contrib/hbide/hbide.hbp
- Dropped -pi option. It is now unnecessary in these cases
(well, all cases in Harbour)
* contrib/hbqt/hbqscintilla/hbqscintilla.hbp
! Fixed content. The referenced plugin name was deleted quite
long ago already when this file was committed. Was this
file ever tested before commit?
+ contrib/hbqt/tests/harbour-logo.png
+ contrib/hbqt/tests/harbour-icon.png
+ contrib/hbqt/tests/testres.prg
+ contrib/hbqt/tests/testres.qrc
+ Added example for QT resource embedding.
Sent to the list by Bacco, with my cleanups, formatting,
renames etc. I didn't add a .hbp file for it, so pls
remember to build it using:
'hbmk2 testres testres.qrc'
2010-07-02 09:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/makefile.prg
! Temporarly disabled -w3 warning level.

46
harbour/contrib/hbide/hbide.hbp
View File

@@ -41,27 +41,27 @@ ideplugins.prg
idedict.prg
idebrowse.prg
-pi=docviewgenerator.ui
-pi=docwriter.ui
-pi=environ.ui
-pi=environments.ui
-pi=finddialog.ui
-pi=findinfiles.ui
-pi=findinfilesex.ui
-pi=findsource.ui
-pi=funclist.ui
-pi=mainwindow.ui
-pi=projectpropertiesex.ui
-pi=searchreplace.ui
-pi=searchreplacepanel.ui
-pi=selectionlist.ui
-pi=selectproject.ui
-pi=setup.ui
-pi=shortcuts.ui
-pi=skeletons.ui
-pi=themes.ui
-pi=themesex.ui
-pi=toolsutilities.ui
-pi=updown.ui
docviewgenerator.ui
docwriter.ui
environ.ui
environments.ui
finddialog.ui
findinfiles.ui
findinfilesex.ui
findsource.ui
funclist.ui
mainwindow.ui
projectpropertiesex.ui
searchreplace.ui
searchreplacepanel.ui
selectionlist.ui
selectproject.ui
setup.ui
shortcuts.ui
skeletons.ui
themes.ui
themesex.ui
toolsutilities.ui
updown.ui
-pi=hbide.qrc
hbide.qrc

9
harbour/contrib/hbqt/hbmk2_plugin_qt.prg
View File

@@ -36,6 +36,15 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
LOCAL lBuildIt
SWITCH hbmk2[ "cSTATE" ]
CASE "init"
hbmk2_Register_Input_File_Extension( hbmk2, ".qrc" )
hbmk2_Register_Input_File_Extension( hbmk2, ".ui" )
hbmk2_Register_Input_File_Extension( hbmk2, ".hpp" )
hbmk2_Register_Input_File_Extension( hbmk2, ".h" )
EXIT
CASE "pre_all"
/* Gather input parameters */

29
harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
View File

@@ -1,26 +1,15 @@
-3rd=hbide_version=1.0
-3rd=hbide_type=Lib
-3rd=hbide_title=qscintilla
-3rd=hbide_output=qscintilla
#
# $Id$
#
../hbqt_common.hbm
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
-info
-trace
-inc
-w2
-es2
-hblib
-incpath=../
-incpath=${HB_WITH_QSCINTILLA}/qt
-incpath=${HB_WITH_QT}
-incpath=${HB_WITH_QT}/QtCore
-incpath=${HB_WITH_QT}/QtGui
-ohbqscintilla
-plugin=../../../utils/hbmk2/examples/plug_moc.prg
-pi=hbqt_hbqsciscintilla.h
hbqt_hbqsciscintilla.h
hbqt_hbqsciscintilla.cpp
HBQsciScintilla.cpp

14
harbour/contrib/hbqt/hbqt.hbp
View File

@@ -21,13 +21,13 @@ hbqt_misc.prg
hbqt_errorsys.prg
THbQtUI.prg
-pi=hbqt_hbdbfmodel.h
-pi=hbqt_hbevents.h
-pi=hbqt_hbqmainwindow.h
-pi=hbqt_hbqplaintextedit.h
-pi=hbqt_hbqsyntaxhighlighter.h
-pi=hbqt_hbqtableview.h
-pi=hbqt_hbslots.h
hbqt_hbdbfmodel.h
hbqt_hbevents.h
hbqt_hbqmainwindow.h
hbqt_hbqplaintextedit.h
hbqt_hbqsyntaxhighlighter.h
hbqt_hbqtableview.h
hbqt_hbslots.h
{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtNetwork.framework/Headers

3
harbour/contrib/hbqt/hbqtcore.hbp
View File

@@ -9,5 +9,4 @@ hbqt_common.hbm
qtcore/*.cpp
qtcore/*.prg
-pi=qtcore/*.h
qtcore/*.h

3
harbour/contrib/hbqt/hbqtgui.hbp
View File

@@ -9,5 +9,4 @@ hbqt_common.hbm
qtgui/*.cpp
qtgui/*.prg
-pi=qtgui/*.h
qtgui/*.h

3
harbour/contrib/hbqt/hbqtnetwork.hbp
View File

@@ -9,5 +9,4 @@ hbqt_common.hbm
qtnetwork/*.cpp
qtnetwork/*.prg
-pi=qtnetwork/*.h
qtnetwork/*.h

3
harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
View File

@@ -9,5 +9,4 @@
*.cpp
*.prg
-pi=*.hpp
*.hpp

4
harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
View File

@@ -9,6 +9,4 @@
*.cpp
*.prg
-pi=*.hpp
*.hpp

BIN
harbour/contrib/hbqt/tests/harbour-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
harbour/contrib/hbqt/tests/harbour-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

54
harbour/contrib/hbqt/tests/testres.prg Normal file
View File

@@ -0,0 +1,54 @@
/*
* $Id: qtver.prg 14742 2010-06-10 21:02:20Z vszakats $
*/
/*
* Harbour Project source code:
*
* Copyright 2010 Bacco
* www - http://harbour-project.org
*
*/
#include "hbqt.ch"
#include "common.ch"
REQUEST HB_QT
STATIC s_qApp
STATIC s_re1
INIT PROCEDURE Qt_Start()
s_qApp := QApplication():new()
s_re1 := QResource():new()
s_re1:registerResource_1( HBQTRES_TESTRES() )
RETURN
EXIT PROCEDURE Qt_End()
s_re1:unregisterResource_1( HBQTRES_TESTRES() )
s_qApp:quit()
RETURN
PROCEDURE Main()
LOCAL oWnd
LOCAL oDA
LOCAL lb1
LOCAL ly1
oWnd := QMainWindow():new()
oWnd:setWindowIcon( ":harbour-icon.png" )
oDA := QWidget():new()
oWnd:setCentralWidget( oDA )
lb1 := Qlabel():new()
lb1:setAlignment( hb_bitOr( Qt_AlignHCenter, Qt_AlignVCenter ) )
lb1:setPixMap( QPixMap():new( ":harbour-logo.png" ) )
ly1 := QVBoxLayout():new( oDA )
ly1:addWidget( lb1 )
oWnd:Show()
s_qApp:exec()
RETURN

6
harbour/contrib/hbqt/tests/testres.qrc Normal file
View File

@@ -0,0 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/">
<file>harbour-icon.png</file>
<file>harbour-logo.png</file>
</qresource>
</RCC>

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

@@ -359,30 +359,31 @@ REQUEST hbmk_KEYW
#define _HBMK_hPLUGINHRB 86
#define _HBMK_hPLUGINVars 87
#define _HBMK_aPLUGINPars 88
#define _HBMK_hPLUGINExt 89
#define _HBMK_lDEBUGTIME 89
#define _HBMK_lDEBUGINC 90
#define _HBMK_lDEBUGSTUB 91
#define _HBMK_lDEBUGI18N 92
#define _HBMK_lDEBUGDEPD 93
#define _HBMK_lDEBUGTIME 90
#define _HBMK_lDEBUGINC 91
#define _HBMK_lDEBUGSTUB 92
#define _HBMK_lDEBUGI18N 93
#define _HBMK_lDEBUGDEPD 94
#define _HBMK_cCCPATH 94
#define _HBMK_cCCPREFIX 95
#define _HBMK_cCCPOSTFIX 96
#define _HBMK_cCCEXT 97
#define _HBMK_cCCPATH 95
#define _HBMK_cCCPREFIX 96
#define _HBMK_cCCPOSTFIX 97
#define _HBMK_cCCEXT 98
#define _HBMK_cWorkDir 98
#define _HBMK_cWorkDirDynSub 99
#define _HBMK_nCmd_Esc 100
#define _HBMK_nScr_Esc 101
#define _HBMK_nCmd_FNF 102
#define _HBMK_nScr_FNF 103
#define _HBMK_nErrorLevel 104
#define _HBMK_cWorkDir 99
#define _HBMK_cWorkDirDynSub 100
#define _HBMK_nCmd_Esc 101
#define _HBMK_nScr_Esc 102
#define _HBMK_nCmd_FNF 103
#define _HBMK_nScr_FNF 104
#define _HBMK_nErrorLevel 105
#define _HBMK_cPROGDIR 105
#define _HBMK_cPROGNAME 106
#define _HBMK_cPROGDIR 106
#define _HBMK_cPROGNAME 107
#define _HBMK_MAX_ 106
#define _HBMK_MAX_ 107
#define _HBMK_DEP_CTRL_MARKER ".control." /* must be an invalid path */
@@ -841,8 +842,12 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
hbmk[ _HBMK_lBLDFLGL ] := .F.
hbmk[ _HBMK_aPLUGIN ] := {}
hbmk[ _HBMK_hPLUGINHRB ] := { => }
hbmk[ _HBMK_hPLUGINVars ] := { => }
hbmk[ _HBMK_aPLUGINPars ] := {}
hbmk[ _HBMK_hPLUGINExt ] := { => }
hb_HSetCaseMatch( hbmk[ _HBMK_hPLUGINExt ], .F. )
hbmk[ _HBMK_lDEBUGTIME ] := .F.
hbmk[ _HBMK_lDEBUGINC ] := .F.
@@ -2101,6 +2106,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
cParam := PathProc( PathSepToSelf( MacroProc( hbmk, SubStr( cParam, Len( "-plugin=" ) + 1 ), aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
IF ( tmp := FindInPathPlugIn( cParam ) ) != NIL
AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
PlugIn_Load( hbmk, tmp )
ELSE
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Plugin not found: %1$s" ), cParam ) )
@@ -2240,6 +2246,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
cParam := PathProc( PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
IF ( tmp := FindInPathPlugIn( cParam ) ) != NIL
AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
PlugIn_Load( hbmk, tmp )
ELSE
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Plugin not found: %1$s" ), cParam ) )
@@ -2331,6 +2338,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
hbmk[ _HBMK_cHBL ] := PathSepToSelf( cParam )
hbmk[ _HBMK_cHBLDir ] := FN_DirGet( aParam[ _PAR_cFileName ] )
CASE FN_ExtGet( cParamL ) $ hbmk[ _HBMK_hPLUGINExt ]
cParam := PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ) )
FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) )
AAdd( hbmk[ _HBMK_aPLUGINPars ], cParam )
NEXT
OTHERWISE
cParam := PathProc( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] )
@@ -3909,10 +3923,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
ENDIF
/* Prepare plugins */
/* Call plugins */
PlugIn_Load( hbmk )
PlugIn_Execute( hbmk, "pre_all" )
PlugIn_Execute_All( hbmk, "pre_all" )
/* ; */
@@ -4072,7 +4085,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF ( ! lSkipBuild .AND. ! lStopAfterInit .AND. ! lStopAfterHarbour .AND. hbmk[ _HBMK_nHBMODE ] != _HBMODE_RAW_C ) .OR. ;
( nHarbourPPO >= 2 .AND. lStopAfterHarbour ) /* or in preprocessor mode */
PlugIn_Execute( hbmk, "pre_prg" )
PlugIn_Execute_All( hbmk, "pre_prg" )
/* Incremental */
@@ -4706,7 +4719,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF Len( l_aRESSRC_TODO ) > 0 .AND. ! Empty( cBin_Res ) .AND. ! hbmk[ _HBMK_lCLEAN ]
PlugIn_Execute( hbmk, "pre_res" )
PlugIn_Execute_All( hbmk, "pre_res" )
IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ]
hbmk_OutStd( hbmk, I_( "Compiling resources..." ) )
@@ -4822,7 +4835,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
ENDIF
PlugIn_Execute( hbmk, "pre_c" )
PlugIn_Execute_All( hbmk, "pre_c" )
IF ! hbmk[ _HBMK_lCLEAN ]
@@ -5035,7 +5048,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
DO CASE
CASE ! lStopAfterCComp .AND. ! Empty( cBin_Link )
PlugIn_Execute( hbmk, "pre_link" )
PlugIn_Execute_All( hbmk, "pre_link" )
IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Linking... %1$s" ), hbmk[ _HBMK_cPROGNAME ] ) )
@@ -5129,7 +5142,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateDyn ] .AND. ! Empty( cBin_Dyn )
PlugIn_Execute( hbmk, "pre_link" )
PlugIn_Execute_All( hbmk, "pre_link" )
IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Creating dynamic library... %1$s" ), hbmk[ _HBMK_cPROGNAME ] ) )
@@ -5197,7 +5210,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateLib ] .AND. ! Empty( cBin_Lib )
PlugIn_Execute( hbmk, "pre_lib" )
PlugIn_Execute_All( hbmk, "pre_lib" )
IF ( hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ] ) .OR. hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Creating static library... %1$s" ), hbmk[ _HBMK_cPROGNAME ] ) )
@@ -5265,7 +5278,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
/* Cleanup */
PlugIn_Execute( hbmk, "pre_cleanup" )
PlugIn_Execute_All( hbmk, "pre_cleanup" )
IF ! Empty( l_cCSTUB )
FErase( l_cCSTUB )
@@ -5413,10 +5426,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
ENDIF
PlugIn_Execute( hbmk, "post_build" )
PlugIn_Execute_All( hbmk, "post_build" )
ENDIF
PlugIn_Execute( hbmk, "post_all" )
PlugIn_Execute_All( hbmk, "post_all" )
IF hbmk[ _HBMK_lDEBUGTIME ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Running time: %1$ss" ), hb_ntos( TimeElapsed( nStart, Seconds() ) ) ) )
@@ -6408,56 +6421,50 @@ STATIC FUNCTION FindInSamePath( cFileName, cFileName2, cPath )
RETURN NIL
STATIC PROCEDURE PlugIn_Load( hbmk )
LOCAL cFileName
STATIC PROCEDURE PlugIn_Load( hbmk, cFileName )
LOCAL cFile
LOCAL cExt
LOCAL lOK
LOCAL cType
LOCAL hrb
LOCAL hrb := NIL
hbmk[ _HBMK_hPLUGINHRB ] := { => }
hb_FNameSplit( cFileName, NIL, NIL, @cExt )
FOR EACH cFileName IN hbmk[ _HBMK_aPLUGIN ]
cFile := hb_MemoRead( cFileName )
hb_FNameSplit( cFileName, NIL, NIL, @cExt )
hrb := NIL
cFile := hb_MemoRead( cFileName )
IF ! Empty( cFile )
lOK := .F.
/* Optimization: Don't try to load it as .hrb if the extension is .prg or .hbs (Harbour script) */
IF !( Lower( cExt ) == ".prg" ) .AND. ;
!( Lower( cExt ) == ".hbs" )
BEGIN SEQUENCE WITH {| oError | Break( oError ) }
hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
cType := I_( "(compiled)" )
lOK := .T.
END SEQUENCE
ENDIF
IF ! lOK .AND. !( Lower( cExt ) == ".hrb" ) /* Optimization: Don't try to load it as .prg if the extension is .hrb */
cType := I_( "(source)" )
cFile := hb_compileFromBuf( cFile, "-n2", "-w3", "-es2", "-q0", "-D" + _HBMK_SCRIPT )
IF ! Empty( cFile )
hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
ENDIF
IF ! Empty( cFile )
lOK := .F.
/* Optimization: Don't try to load it as .hrb if the extension is .prg or .hbs (Harbour script) */
IF !( Lower( cExt ) == ".prg" ) .AND. ;
!( Lower( cExt ) == ".hbs" )
BEGIN SEQUENCE WITH {| oError | Break( oError ) }
hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
cType := I_( "(compiled)" )
lOK := .T.
END SEQUENCE
ENDIF
IF ! lOK .AND. !( Lower( cExt ) == ".hrb" ) /* Optimization: Don't try to load it as .prg if the extension is .hrb */
cType := I_( "(source)" )
cFile := hb_compileFromBuf( cFile, "-n2", "-w3", "-es2", "-q0", "-D" + _HBMK_SCRIPT )
IF ! Empty( cFile )
hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
ENDIF
ENDIF
ENDIF
IF ! Empty( hrb )
hbmk[ _HBMK_hPLUGINHRB ][ cFileName ] := hrb
IF ! Empty( hrb )
hbmk[ _HBMK_hPLUGINHRB ][ cFileName ] := hrb
IF hbmk[ _HBMK_lTRACE ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Loaded plugin #%1$s: %2$s %3$s" ), hb_ntos( cFileName:__enumIndex() ), cFileName, cType ) )
ENDIF
ELSE
IF hbmk[ _HBMK_lInfo ]
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Loading plugin: %1$s" ), cFileName ) )
ENDIF
IF hbmk[ _HBMK_lTRACE ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Loaded plugin: %1$s %2$s" ), cFileName, cType ) )
ENDIF
NEXT
PlugIn_call_low( hbmk, cFileName, hrb, PlugIn_make_ctx( hbmk, "init" ) )
ELSE
IF hbmk[ _HBMK_lInfo ]
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Loading plugin: %1$s" ), cFileName ) )
ENDIF
ENDIF
RETURN
@@ -6486,57 +6493,91 @@ FUNCTION hbmk2_StrStripQuote( ... ) ; RETURN StrStripQuote( ... )
FUNCTION hbmk2_OutStdRaw( ... ) ; RETURN ( OutStd( ... ), OutStd( _OUT_EOL ) )
FUNCTION hbmk2_OutErrRaw( ... ) ; RETURN ( OutErr( ... ), OutErr( _OUT_EOL ) )
STATIC FUNCTION ctx_to_hbmk( ctx )
LOCAL hbmk
IF hb_isHash( ctx ) .AND. s_cSecToken $ ctx
hbmk := ctx[ s_cSecToken ]
IF ISARRAY( hbmk ) .AND. Len( hbmk ) == _HBMK_MAX_
RETURN hbmk
ENDIF
ENDIF
RETURN NIL
FUNCTION hbmk2_Macro( ctx, cString )
LOCAL hbmk := ctx[ s_cSecToken ]
RETURN MacroProc( hbmk, cString )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN MacroProc( hbmk, cString )
ENDIF
RETURN ""
FUNCTION hbmk2_OutStd( ctx, cText )
LOCAL hbmk := ctx[ s_cSecToken ]
RETURN hbmk_OutStd( hbmk, hb_StrFormat( I_( "plugin: %1$s" ), 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 )
LOCAL hbmk := ctx[ s_cSecToken ]
RETURN hbmk_OutErr( hbmk, hb_StrFormat( I_( "plugin: %1$s" ), 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, ... )
LOCAL hbmk := ctx[ s_cSecToken ]
RETURN PathSepToTarget( hbmk, ... )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL
RETURN PathSepToTarget( hbmk, ... )
ENDIF
RETURN ""
FUNCTION hbmk2_AddInput_PRG( ctx, cFileName )
LOCAL hbmk := ctx[ s_cSecToken ]
AAdd( hbmk[ _HBMK_aPRG ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. ISCHARACTER( cFileName )
AAdd( hbmk[ _HBMK_aPRG ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_C( ctx, cFileName )
LOCAL hbmk := ctx[ s_cSecToken ]
AAdd( hbmk[ _HBMK_aC ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. ISCHARACTER( cFileName )
AAdd( hbmk[ _HBMK_aC ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_CPP( ctx, cFileName )
LOCAL hbmk := ctx[ s_cSecToken ]
AAdd( hbmk[ _HBMK_aCPP ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. ISCHARACTER( cFileName )
AAdd( hbmk[ _HBMK_aCPP ], PathSepToSelf( cFileName ) )
DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName )
ENDIF
RETURN NIL
FUNCTION hbmk2_AddInput_RC( ctx, cFileName )
LOCAL hbmk := ctx[ s_cSecToken ]
AAdd( hbmk[ _HBMK_aRESSRC ], PathSepToSelf( cFileName ) )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. ISCHARACTER( cFileName )
AAdd( hbmk[ _HBMK_aRESSRC ], PathSepToSelf( cFileName ) )
ENDIF
RETURN NIL
FUNCTION hbmk2_Register_Input_File_Extension( ctx, cExt )
LOCAL hbmk := ctx_to_hbmk( ctx )
IF hbmk != NIL .AND. ISCHARACTER( cExt )
IF ! Empty( cExt )
IF !( Left( cExt, 1 ) == "." )
cExt := "." + cExt
ENDIF
hbmk[ _HBMK_hPLUGINExt ][ Lower( cExt ) ] := NIL
ENDIF
ENDIF
RETURN NIL
/* ; */
STATIC FUNCTION PlugIn_Execute( hbmk, cState )
LOCAL hrb
LOCAL ctx
LOCAL xResult
LOCAL oError
IF ! Empty( hbmk[ _HBMK_hPLUGINHRB ] )
ctx := {;
STATIC FUNCTION PlugIn_make_ctx( hbmk, cState )
RETURN {;
"cSTATE" => cState ,;
"params" => hbmk[ _HBMK_aPLUGINPars ] ,;
"vars" => hbmk[ _HBMK_hPLUGINVars ] ,;
@@ -6571,24 +6612,37 @@ STATIC FUNCTION PlugIn_Execute( hbmk, cState )
"nErrorLevel" => hbmk[ _HBMK_nErrorLevel ] ,;
s_cSecToken => hbmk }
FOR EACH hrb IN hbmk[ _HBMK_hPLUGINHRB ]
STATIC PROCEDURE PlugIn_call_low( hbmk, cName, hrb, ctx )
LOCAL xResult
LOCAL oError
BEGIN SEQUENCE WITH {| oError | oError:cargo := { ProcName( 1 ), ProcLine( 1 ) }, Break( oError ) }
xResult := hb_hrbDo( hrb, ctx )
IF ! Empty( xResult )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Plugin %1$s returned: '%2$s'" ), hrb:__enumKey(), xResult ) )
ENDIF
ENDIF
RECOVER USING oError
IF ! hbmk[ _HBMK_lQuiet ]
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Executing plugin: %1$s at %3$s(%4$s)\n'%2$s'" ), hrb:__enumKey(), hbmk_ErrorMessage( oError ), oError:cargo[ 1 ], hb_ntos( oError:cargo[ 2 ] ) ) )
ENDIF
END SEQUENCE
BEGIN SEQUENCE WITH {| oError | oError:cargo := { ProcName( 1 ), ProcLine( 1 ) }, Break( oError ) }
xResult := hb_hrbDo( hrb, ctx )
IF ! Empty( xResult )
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Plugin %1$s returned: '%2$s'" ), cName, xResult ) )
ENDIF
ENDIF
RECOVER USING oError
IF ! hbmk[ _HBMK_lQuiet ]
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Executing plugin: %1$s at %3$s(%4$s)\n'%2$s'" ), cName, hbmk_ErrorMessage( oError ), oError:cargo[ 1 ], hb_ntos( oError:cargo[ 2 ] ) ) )
ENDIF
END SEQUENCE
RETURN
STATIC PROCEDURE PlugIn_Execute_All( hbmk, cState )
LOCAL hrb
LOCAL ctx
IF ! Empty( hbmk[ _HBMK_hPLUGINHRB ] )
ctx := PlugIn_make_ctx( hbmk, cState )
FOR EACH hrb IN hbmk[ _HBMK_hPLUGINHRB ]
PlugIn_call_low( hbmk, hrb:__enumKey(), hrb, ctx )
NEXT
ENDIF
RETURN NIL
RETURN
STATIC FUNCTION hbmk_ErrorMessage( oError )
/* start error message */
@@ -7483,6 +7537,10 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
AAddNew( hbmk[ _HBMK_aRESCMP ], tmp )
NEXT
ENDIF
CASE FN_ExtGet( cItemL ) $ hbmk[ _HBMK_hPLUGINExt ]
FOR EACH tmp IN FN_Expand( cItem, .F. )
AAddNew( hbmk[ _HBMK_aPLUGINPars ], tmp )
NEXT
OTHERWISE /* .prg */
IF Empty( FN_ExtGet( cItem ) )
cItem := FN_ExtSet( cItem, ".prg" )
@@ -7746,6 +7804,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
cLine := PathNormalize( PathProc( PathSepToSelf( MacroProc( hbmk, cLine, cFileName ) ), FN_DirGet( cFileName ) ) )
IF ( tmp := FindInPathPlugIn( cLine ) ) != NIL
AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
PlugIn_Load( hbmk, tmp )
ELSE
IF hbmk[ _HBMK_lInfo ]
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Warning: Plugin not found: %1$s" ), cLine ) )