Z991239-385 #comment 模块添加版本号打印

Common/SpBase.h

@@ -1025,6 +1025,9 @@ public:
 	/** get this entity name */
 	virtual const char *GetEntityName()const=0;
 
+	/** get this entity version*/
+	virtual const char* GetEntityVersion() const { return "0.0.0"; }
+
 	/** is this entity hosts service ? */
 	virtual bool IsService()const{return false;}
 

module/CMakeLists.txt

@@ -39,8 +39,14 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         @ONLY)
         set(${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
     endif(WIN32)
+
     add_library(${_module_name} SHARED ${${_module_prefix}_SRCS})
+    
     target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_DIR}/include)
+    
+    configure_file("${MODULE_BASE_DIR}/include/modVer.h.in" "${CMAKE_CURRENT_BINARY_DIR}/modVer.h")
+    target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
     # ÉèÖù¤³ÌÊä³ö·¾¶
     if(SIMULATE_DEV_AND_TEST_TEMP)
         set_target_properties(${_module_name} 
@@ -56,6 +62,11 @@ macro(deploy_module _module_prefix _module_name)
     ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}"
     COMPONENT modules)
+
+    if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+        install(FILES ${CMAKE_PDB_BINARY_DIR}/${_module_name}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    endif()
+
     set_property(TARGET ${_module_name} PROPERTY FOLDER "module/")
 endmacro(deploy_module)
 

module/include/modVer.h.in

@@ -0,0 +1,13 @@
+#ifndef MODULE_VERSION_H
+#define MODULE_VERSION_H
+
+#define MODULE_VERSION_MAJOR ${MOD_VERSION_MAJOR}
+#define MODULE_VERSION_MINOR ${MOD_VERSION_MINOR}
+#define MODULE_VERSION_REVISION ${MOD_VERSION_REVISION}
+#define MODULE_VERSION_SUFFIX "${MOD_VERSION_SUFFIX}"
+
+#define MODULE_API_VERSION "${MOD_API_VERSION}"
+#define MODULE_VERSION "${MOD_VERSION}"
+#define MODULE_VERSION_FULL "${MOD_VERSION_FULL}"
+
+#endif /* MODULE_VERSION_H */

module/mod_blackSheep/mod_blackSheep.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "SpBase.h"
 
+#include "modVer.h"
+
 /*one of test module: use to test error: erro startup*/
 
 class CBlackSheep : public CEntityBase
@@ -10,6 +12,7 @@ public:
 	virtual ~CBlackSheep() {}
 	virtual const char *GetEntityName() const { return "BlackSheep"; }
 
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext)
 	{

module/mod_helloclient/mod_helloclient.cpp

@@ -5,6 +5,8 @@
 
 #include <winpr/synch.h>
 
+#include "modVer.h"
+
 using namespace HelloService;
 
 class HelloClientEntity : public CEntityBase, public ITimerListener, public ISysVarListener
@@ -14,6 +16,8 @@ public:
 	virtual ~HelloClientEntity() {}
 	virtual const char *GetEntityName() const { return "HelloClient"; }
 
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
+
 	virtual void OnTimeout(DWORD dwTimerID)
 	{
 		LOG_FUNCTION();

module/mod_sample/mod_SampleEntity.h

@@ -10,6 +10,8 @@
 #include "SampleFSM.h"
 #include "SpTest.h"
 
+#include "modVer.h"
+
 using namespace SampleEntity;
 
 class SampleService_Session : public SampleService_ServerSessionBase

module/mod_testHighVoltage/mod_highVoltage.cpp

@@ -1,4 +1,5 @@
 #include "mod_highVoltageBase.hpp"
+#include "modVer.h"
 
 /*one of test module: use to high voltage test*/
 

module/mod_testHighVoltageFifth/mod_highVoltageFifth.cpp

@@ -1,4 +1,5 @@
 #include "mod_highVoltageBase.hpp"
+#include "modVer.h"
 
 /*one of test module: use to high voltage test*/
 

module/mod_testHighVoltageFour/mod_highVoltage.cpp

@@ -1,4 +1,5 @@
 #include "mod_highVoltageBase.hpp"
+#include "modVer.h"
 
 /*one of test module: use to high voltage test*/
 
@@ -8,6 +9,7 @@ public:
 	CHighVoltageFour() {}
 	virtual ~CHighVoltageFour() {}
 	virtual const char *GetEntityName() const { return "HighVoltageFour"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 };
 
 SP_BEGIN_ENTITY_MAP()

module/mod_testHighVoltageSecond/mod_highVoltage.cpp

@@ -1,4 +1,5 @@
 #include "mod_highVoltageBase.hpp"
+#include "modVer.h"
 
 /*one of test module: use to high voltage test*/
 

module/mod_testHighVoltageThird/mod_highVoltage.cpp

@@ -1,4 +1,5 @@
 #include "mod_highVoltageBase.hpp"
+#include "modVer.h"
 
 /*one of test module: use to high voltage test*/
 
@@ -8,6 +9,7 @@ public:
 	CHighVoltageThird() {}
 	virtual ~CHighVoltageThird() {}
 	virtual const char *GetEntityName() const { return "HighVoltageThird"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 };
 
 SP_BEGIN_ENTITY_MAP()

module/mod_testNormalEntity/mod_testNormalEntity.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
+#include "modVer.h"
 
 /*one of test module: use to test error: erro startup*/
 
@@ -10,6 +11,7 @@ public:
 	CNormalEntityTest() {}
 	virtual ~CNormalEntityTest() {}
 	virtual const char *GetEntityName() const { return "TestNormalEntity"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext)

module/mod_testPassiveEntity/mod_testPassiveEntity.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
-
+#include "modVer.h"
 #include "mod_viceEntities.hpp"
 
 /*one of test module: use to boot by other entity which has higher privilege.*/

module/mod_testPrivilegeEntity/mod_testPrivilegeEntity.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
+#include "modVer.h"
 
 const char* CHILD_TEST_ENTITY_NAME = "TestPassiveEntity";
 
@@ -10,6 +11,7 @@ public:
 	CPrivilegeEntityTest(){}
 	virtual ~CPrivilegeEntityTest() {}
 	virtual const char *GetEntityName() const { return "TestPrivilegeEntity"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext)
 	{

module/mod_testSendLog/mod_testSendLog.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
+#include "modVer.h"
 
 #include "SendLogDefine.h"
 
@@ -12,6 +13,7 @@ public:
 	virtual ~CTestSendLog() {
 	}
 	virtual const char *GetEntityName() const { return "TestLogSender"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext)

module/mod_testSubscribe/mod_testSubscribe.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
+#include "modVer.h"
 
 #include "SendLogDefine.h"
 #define SYSVAL_CHANGED_ENTITY_NAME "SampleEntity"
@@ -30,6 +31,7 @@ public:
 			delete[] m_logCalCount;
 	}
 	virtual const char *GetEntityName() const { return "TestSubscribe"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	/*for {ITimerListener} implement*/
 	void OnTimeout(DWORD dwTimerID)

module/mod_validityVertifier/mod_validityVertifier.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "SpBase.h"
 #include "SpTest.h"
+#include "modVer.h"
 
 /*Integrated test deamon*/
 
@@ -32,6 +33,7 @@ public:
 		GetFunction()->GetPrivilegeFunction()->UnregistEntityStateEvent(NULL);
 	}
 	virtual const char *GetEntityName() const { return "TestDeamon"; }
+	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext)
 	{