EgtExecutor 1.8b3 :

- aggiunta in Exe e Lua SetIniFile.
This commit is contained in:
Dario Sassi
2017-02-10 19:04:57 +00:00
parent 2e31a6846e
commit 85e912ceb1
4 changed files with 36 additions and 0 deletions
+3
View File
@@ -16,6 +16,9 @@
#include "GseContext.h"
#include "/EgtDev/Include/EgtILogger.h"
//----------------------------------------------------------------------------
const std::string& ExeGetIniFile( void) ;
//----------------------------------------------------------------------------
ILogger* GetLogger( void) ;
ILogger* GetCmdLogger( void) ;
+16
View File
@@ -41,6 +41,7 @@ static bool s_bCmdLog = false ;
static Logger* s_pCmdLog = nullptr ;
static string s_sKey ;
static int s_nKeyType = KEY_LOCK_TYPE_ANY ;
static string s_sIniFile ;
static pfProcEvents s_pFunProcEvents = nullptr ;
static pfOutText s_pFunOutText = nullptr ;
@@ -215,6 +216,14 @@ ExeSetLuaLibs( const string& sLuaLibsDir)
return LuaSetLuaLibsDir( sLuaLibsDir) ;
}
//-----------------------------------------------------------------------------
bool
ExeSetIniFile( const string& sIniFile)
{
s_sIniFile = sIniFile ;
return true ;
}
//-----------------------------------------------------------------------------
bool
ExeSetCommandLogger( const string& sLogFile)
@@ -418,6 +427,13 @@ ExeOutText( const string& sText)
return false ;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
const string&
ExeGetIniFile( void)
{
return s_sIniFile ;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
BIN
View File
Binary file not shown.
+17
View File
@@ -484,6 +484,22 @@ LuaWriteStringToIni( lua_State* L)
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetIniFile( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// recupero la path del file Ini dell'eseguibile
string sIniFile = ExeGetIniFile() ;
// restituisco il risultato
if ( ! sIniFile.empty())
LuaSetParam( L, sIniFile) ;
else
LuaSetParam( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetVersion( lua_State* L)
@@ -648,6 +664,7 @@ LuaInstallGeneral( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtBinaryFileCompare", LuaBinaryFileCompare) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetStringFromIni", LuaGetStringFromIni) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtWriteStringToIni", LuaWriteStringToIni) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetIniFile", LuaGetIniFile) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetVersion", LuaGetVersion) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtIs64bit", LuaIs64bit) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetLanguage", LuaGetLanguage) ;