From 803e501a35cc7e6a9f2ef2d7efe6afc81005118f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 2 Feb 2011 10:18:27 +0000 Subject: [PATCH] 2011-02-02 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added "nCOMPVer" variable for hbmk2 plugins. This returns C Compiler version, which currently gives results for mingw and msvc. --- harbour/ChangeLog | 6 +++ harbour/utils/hbmk2/hbmk2.prg | 69 ++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7db2ae7ed9..31d78819d4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-02 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Added "nCOMPVer" variable for hbmk2 plugins. This returns + C Compiler version, which currently gives results for + mingw and msvc. + 2011-02-02 11:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/mpkg_win_uni.bat + Redirect stderr too, into the log file. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 67a244d8c3..1f977125a2 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -8023,40 +8023,41 @@ FUNCTION hbmk2_Register_Input_File_Extension( ctx, cExt ) STATIC FUNCTION PlugIn_make_ctx( hbmk, cState ) RETURN {; - "cSTATE" => cState ,; - "params" => hbmk[ _HBMK_aPLUGINPars ] ,; - "vars" => hbmk[ _HBMK_hPLUGINVars ] ,; - "cPLAT" => hbmk[ _HBMK_cPLAT ] ,; - "cCOMP" => hbmk[ _HBMK_cCOMP ] ,; - "cCPU" => hbmk[ _HBMK_cCPU ] ,; - "cBUILD" => hbmk[ _HBMK_cBUILD ] ,; - "cOUTPUTNAME" => hbmk[ _HBMK_cPROGNAME ] ,; - "cTARGETNAME" => hbmk_TARGETNAME( hbmk ) ,; - "cTARGETTYPE" => hbmk_TARGETTYPE( hbmk ) ,; - "lREBUILD" => hbmk[ _HBMK_lREBUILD ] ,; - "lCLEAN" => hbmk[ _HBMK_lCLEAN ] ,; - "lDEBUG" => hbmk[ _HBMK_lDEBUG ] ,; - "lMAP" => hbmk[ _HBMK_lMAP ] ,; - "lSTRIP" => hbmk[ _HBMK_lSTRIP ] ,; - "lDONTEXEC" => hbmk[ _HBMK_lDONTEXEC ] ,; - "lIGNOREERROR" => hbmk[ _HBMK_lIGNOREERROR ] ,; - "lTRACE" => hbmk[ _HBMK_lTRACE ] ,; - "lQUIET" => hbmk[ _HBMK_lQuiet ] ,; - "lINFO" => hbmk[ _HBMK_lInfo ] ,; - "lBEEP" => hbmk[ _HBMK_lBEEP ] ,; - "lRUN" => hbmk[ _HBMK_lRUN ] ,; - "lINC" => hbmk[ _HBMK_lINC ] ,; - "cCCPATH" => hbmk[ _HBMK_cCCPATH ] ,; - "cCCPREFIX" => hbmk[ _HBMK_cCCPREFIX ] ,; - "cCCPOSTFIX" => hbmk[ _HBMK_cCCPOSTFIX ] ,; - "cCCEXT" => hbmk[ _HBMK_cCCEXT ] ,; - "nCmd_Esc" => hbmk[ _HBMK_nCmd_Esc ] ,; - "nScr_Esc" => hbmk[ _HBMK_nScr_Esc ] ,; - "nCmd_FNF" => hbmk[ _HBMK_nCmd_FNF ] ,; - "nScr_FNF" => hbmk[ _HBMK_nScr_FNF ] ,; - "cWorkDir" => hbmk[ _HBMK_cWorkDir ] ,; - "nErrorLevel" => hbmk[ _HBMK_nErrorLevel ] ,; - s_cSecToken => hbmk } + "cSTATE" => cState ,; + "params" => hbmk[ _HBMK_aPLUGINPars ] ,; + "vars" => hbmk[ _HBMK_hPLUGINVars ] ,; + "cPLAT" => hbmk[ _HBMK_cPLAT ] ,; + "cCOMP" => hbmk[ _HBMK_cCOMP ] ,; + "nCOMPVer" => hbmk[ _HBMK_nCOMPVer ] ,; + "cCPU" => hbmk[ _HBMK_cCPU ] ,; + "cBUILD" => hbmk[ _HBMK_cBUILD ] ,; + "cOUTPUTNAME" => hbmk[ _HBMK_cPROGNAME ] ,; + "cTARGETNAME" => hbmk_TARGETNAME( hbmk ) ,; + "cTARGETTYPE" => hbmk_TARGETTYPE( hbmk ) ,; + "lREBUILD" => hbmk[ _HBMK_lREBUILD ] ,; + "lCLEAN" => hbmk[ _HBMK_lCLEAN ] ,; + "lDEBUG" => hbmk[ _HBMK_lDEBUG ] ,; + "lMAP" => hbmk[ _HBMK_lMAP ] ,; + "lSTRIP" => hbmk[ _HBMK_lSTRIP ] ,; + "lDONTEXEC" => hbmk[ _HBMK_lDONTEXEC ] ,; + "lIGNOREERROR" => hbmk[ _HBMK_lIGNOREERROR ] ,; + "lTRACE" => hbmk[ _HBMK_lTRACE ] ,; + "lQUIET" => hbmk[ _HBMK_lQuiet ] ,; + "lINFO" => hbmk[ _HBMK_lInfo ] ,; + "lBEEP" => hbmk[ _HBMK_lBEEP ] ,; + "lRUN" => hbmk[ _HBMK_lRUN ] ,; + "lINC" => hbmk[ _HBMK_lINC ] ,; + "cCCPATH" => hbmk[ _HBMK_cCCPATH ] ,; + "cCCPREFIX" => hbmk[ _HBMK_cCCPREFIX ] ,; + "cCCPOSTFIX" => hbmk[ _HBMK_cCCPOSTFIX ] ,; + "cCCEXT" => hbmk[ _HBMK_cCCEXT ] ,; + "nCmd_Esc" => hbmk[ _HBMK_nCmd_Esc ] ,; + "nScr_Esc" => hbmk[ _HBMK_nScr_Esc ] ,; + "nCmd_FNF" => hbmk[ _HBMK_nCmd_FNF ] ,; + "nScr_FNF" => hbmk[ _HBMK_nScr_FNF ] ,; + "cWorkDir" => hbmk[ _HBMK_cWorkDir ] ,; + "nErrorLevel" => hbmk[ _HBMK_nErrorLevel ] ,; + s_cSecToken => hbmk } STATIC FUNCTION PlugIn_ctx_get_state( ctx ) RETURN ctx[ "cSTATE" ]