Put the proper version number in service titles

ryzom/common/src/game_share/ryzom_version.h

@@ -17,7 +17,12 @@
 #ifndef RYZOM_VERSION_H
 #define RYZOM_VERSION_H
 
-#define RYZOM_VERSION "3.0.0"
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#else
+#	define RYZOM_VERSION "3.0.0.0"
+#	define RYZOM_PRODUCT_VERSION "3.0.0"
+#endif
 
 #endif // RYZOM_VERSION_H
 

ryzom/server/src/ai_service/service_main.cpp

@@ -186,7 +186,7 @@ void CAIService::init (void)
 	// init static fame manager
 	CStaticFames::getInstance();
 
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// Init ligo
 	if (!LigoConfig.readPrimitiveClass ("world_editor_classes.xml", false))

ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp

@@ -352,7 +352,7 @@ void CDynamicScenarioService::init()
 		nlwarning("No variable ShardId in config file, this could result in miss registered DSS into SU because of late WS shard id message");
 	}
 
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// setup the update systems
 	setUpdateTimeout(100);

ryzom/server/src/entities_game_service/entities_game_service.cpp

@@ -1308,7 +1308,7 @@ void CPlayerService::init()
 	// a little boolean set to true if we are just packing sheets and then exitting, allowing us to skip stuff that we don't really need to do
 	bool packingSheets= haveArg('Q');
 
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	StatPath = "data_shard_local/statistics/egs_stat.log";
 	CFile::createDirectory("data_shard_local");

ryzom/server/src/frontend_service/frontend_service.cpp

@@ -1187,7 +1187,7 @@ inline void	CFrontEndService::onTick()
 
 void CFrontEndService::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	nlinfo( "Initializing front-end service..." );
 

ryzom/server/src/general_utilities_service/service_main.cpp

@@ -58,7 +58,7 @@ using namespace NLNET;
 
 void CServiceClass::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// if we are connecting to a shard then start by initializing the tick interface
 	if (IService::getInstance()->ConfigFile.getVarPtr("DontUseTS")==NULL || IService::getInstance()->ConfigFile.getVarPtr("DontUseTS")->asInt()==0)

ryzom/server/src/gpm_service/client_messages.cpp

@@ -29,7 +29,6 @@
 //#include "game_share/bot_chat_types.h"
 //#include "game_share/brick_types.h"
 //#include "game_share/loot_harvest_state.h"
-//#include "game_share/ryzom_version.h"
 //#include "game_share/ryzom_mirror_properties.h"
 
 #include "server_share/r2_variables.h"

ryzom/server/src/gpm_service/gpm_service.cpp

@@ -263,7 +263,7 @@ void	cbMirrorIsReady( CMirror *mirror )
 // init the service
 void CGlobalPositionManagerService::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// keep pointer on class
 	pCGPMS = this;

ryzom/server/src/gpm_service/messages.cpp

@@ -35,7 +35,6 @@
 //#include "game_share/bot_chat_types.h"
 //#include "game_share/brick_types.h"
 //#include "game_share/loot_harvest_state.h"
-//#include "game_share/ryzom_version.h"
 //#include "game_share/synchronised_message.h"
 
 using namespace std;

ryzom/server/src/input_output_service/input_output_service.cpp

@@ -333,7 +333,7 @@ void CInputOutputService::init()
 	// init string manager parameter traits
 	CStringManager::CParameterTraits::init();
 
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 	
 	IOS = this;
 	setUpdateTimeout(100);

ryzom/server/src/input_output_service/messages.cpp

@@ -30,8 +30,7 @@
 #include "game_share/news_types.h"
 #include "game_share/bot_chat_types.h"
 #include "game_share/brick_types.h"
-#include "game_share/loot_harvest_state.h"
-#include "game_share/ryzom_version.h"*/
+#include "game_share/loot_harvest_state.h"*/
 #include "game_share/generic_xml_msg_mngr.h"
 
 /*#include <nel/misc/command.h>*/

ryzom/server/src/input_output_service/stdpch.h

@@ -83,7 +83,6 @@
 #include "game_share/roles.h"
 #include "game_share/ryzom_entity_id.h"
 #include "game_share/ryzom_mirror_properties.h"
-#include "game_share/ryzom_version.h"
 #include "game_share/scores.h"
 #include "game_share/shard_names.h"
 #include "game_share/singleton_registry.h"

ryzom/server/src/mirror_service/mirror_service.cpp

@@ -147,7 +147,7 @@ extern void cbOnMasterSync();
  */
 void	CMirrorService::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	MSInstance = this;
 

ryzom/server/src/monitor_service/service_main.cpp

@@ -502,7 +502,7 @@ static void cbServiceDown( const std::string& serviceName, TServiceId  serviceId
 
 void CMonitorService::init ()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// Init the server on port
 	Server = new CCallbackServer();

ryzom/server/src/patchman_service/service_main.cpp

@@ -61,7 +61,7 @@ using namespace NLNET;
 
 void CServiceClass::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 	_ExitRequested= false;
 
 //	// run self tests before we begin

ryzom/server/src/pd_support_service/service_main.cpp

@@ -69,7 +69,7 @@ using namespace NLNET;
 
 void CServiceClass::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	// if we are connecting to a shard then start by initializing the tick interface
 	if (IService::getInstance()->ConfigFile.getVarPtr("DontUseTS")==NULL || IService::getInstance()->ConfigFile.getVarPtr("DontUseTS")->asInt()==0)

ryzom/server/src/tick_service/tick_service.cpp

@@ -586,7 +586,7 @@ void CTickService::displayGameTime() const
  */
 void CTickService::init()
 {
-	setVersion (RYZOM_VERSION);
+	setVersion (RYZOM_PRODUCT_VERSION);
 
 	CurrentMode = TickRunning;