From 1cfae710b664cd9faa42315d84cab47f8f56b2f0 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 21 Dec 2013 16:20:28 +0000
Subject: [PATCH] TestEGk 1.4l2 : Ricompilazioni.

---
 TegExecutor.cpp         |   8 +++++---
 TestEGk.cpp             |   4 ++--
 TestEGk.rc              | Bin 7634 -> 7638 bytes
 TestEGk.vcxproj         |   5 +++--
 TestEGk.vcxproj.filters |  15 +++++++++------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/TegExecutor.cpp b/TegExecutor.cpp
index 06afb82..994f567 100644
--- a/TegExecutor.cpp
+++ b/TegExecutor.cpp
@@ -19,6 +19,7 @@
 #include "/EgtDev/Include/EGnFileUtils.h"
 #include "/EgtDev/Include/EGnFileCompare.h"
 #include "/EgtDev/Include/EgnCmdParser.h"
+#include "/EgtDev/Include/EGkDllMain.h"
 #include "/EgtDev/Include/EGkGeomDB.h"
 #include "/EgtDev/Include/EGkGdbExecutor.h"
 
@@ -58,7 +59,7 @@ TegExecutor::Execute( const string& sCmd1, const string& sCmd2, const STRVECTOR&
       sOut += *theConstIter ;
    }
    sOut += "]" ;
-   LOG_DEBUG( m_pLogger, sOut.c_str()) ;
+   LOG_DBG_INFO( m_pLogger, sOut.c_str()) ;
 
   // esecuzione comando
    if ( sCmd1 == "RUN") {
@@ -108,8 +109,9 @@ TegExecutor::ExecuteRun( const string& sCmd2, const STRVECTOR& vsParams)
       }
 
      // inizializzazioni
-      pGdb->Init( m_pLogger) ;
-      pGdbExec->Init( Get( pGdb), m_pLogger) ;
+      SetEGkLogger( m_pLogger) ;
+      pGdb->Init() ;
+      pGdbExec->Init( Get( pGdb)) ;
       if ( ! pCmdParser->Init( vsParams[0], Get( pGdbExec), m_pLogger)) {
          string sOut = "Error on Parser.Init (" + vsParams[0] + ")" ;
          LOG_ERROR( m_pLogger, sOut.c_str()) ;
diff --git a/TestEGk.cpp b/TestEGk.cpp
index 0554446..aaa618e 100644
--- a/TestEGk.cpp
+++ b/TestEGk.cpp
@@ -15,11 +15,11 @@
 #include "stdafx.h"
 #include "TegExecutor.h"
 #include "/EgtDev/Include/EgnGetModuleVer.h"
-#include "/EgtDev/Include/EGnVersion.h"
+#include "/EgtDev/Include/EGnDllMain.h"
 #include "/EgtDev/Include/EGnStringUtils.h"
 #include "/EgtDev/Include/EGnStringConverter.h"
 #include "/EgtDev/Include/EgnCmdParser.h"
-#include "/EgtDev/Include/EGkVersion.h"
+#include "/EgtDev/Include/EGkDllMain.h"
 #include "/EgtDev/Include/EGkGeomDB.h"
 #include "/EgtDev/Include/EGkGdbExecutor.h"
 #include "/EgtDev/Include/EgtPointerOwner.h"
diff --git a/TestEGk.rc b/TestEGk.rc
index 9423bcc51d011557350441ce90e26974d3e0baca..0e6703e6ad957f1618b8d2475fa943103f044493 100644
GIT binary patch
delta 64
zcmca)ea(8q7dBQS1|0^Y&FA@UGEKg~8Ni&wU^JOgM0axlR}BkX&XpNS+>LQ_m#_yH
E0GKTjVE_OC

delta 60
zcmca+eaU*m7dB=c2Gh+y*)*A%6B$e=U*y!?>>=dFxOoP*88cMsCe!3Kf;mXiecS+V
CU=ybR

diff --git a/TestEGk.vcxproj b/TestEGk.vcxproj
index 28638ec..22233cd 100644
--- a/TestEGk.vcxproj
+++ b/TestEGk.vcxproj
@@ -93,13 +93,14 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\Include\EGkDllMain.h" />
     <ClInclude Include="..\Include\EgkGdbExecutor.h" />
     <ClInclude Include="..\Include\EGkGeomDB.h" />
-    <ClInclude Include="..\Include\EGkVersion.h" />
     <ClInclude Include="..\Include\EgnCmdParser.h" />
+    <ClInclude Include="..\Include\EGnDllMain.h" />
+    <ClInclude Include="..\Include\EgnGetModuleVer.h" />
     <ClInclude Include="..\Include\EGnStringConverter.h" />
     <ClInclude Include="..\Include\EGnStringUtils.h" />
-    <ClInclude Include="..\Include\EGnVersion.h" />
     <ClInclude Include="..\Include\EgtILogger.h" />
     <ClInclude Include="..\Include\EgtIniFile.h" />
     <ClInclude Include="..\Include\EgtLogger.h" />
diff --git a/TestEGk.vcxproj.filters b/TestEGk.vcxproj.filters
index d19a101..9d41ba4 100644
--- a/TestEGk.vcxproj.filters
+++ b/TestEGk.vcxproj.filters
@@ -18,15 +18,9 @@
     <ClInclude Include="stdafx.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\EGkVersion.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\EGnStringUtils.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\EGnVersion.h">
-      <Filter>File di intestazione</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\EgkGdbExecutor.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
@@ -57,6 +51,15 @@
     <ClInclude Include="..\Include\EgtIniFile.h">
       <Filter>File di intestazione</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\EGkDllMain.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EGnDllMain.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\EgnGetModuleVer.h">
+      <Filter>File di intestazione</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">