From 7709977b487d07cdb88e44a822f986f72c94c299 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 20 Jun 2021 02:55:51 +0800 Subject: [PATCH] Put the proper version number in service titles --- ryzom/common/src/game_share/ryzom_version.h | 7 ++++++- ryzom/server/src/ai_service/service_main.cpp | 2 +- .../dynamic_scenario_service/dynamic_scenario_service.cpp | 2 +- .../src/entities_game_service/entities_game_service.cpp | 2 +- ryzom/server/src/frontend_service/frontend_service.cpp | 2 +- .../server/src/general_utilities_service/service_main.cpp | 2 +- ryzom/server/src/gpm_service/client_messages.cpp | 1 - ryzom/server/src/gpm_service/gpm_service.cpp | 2 +- ryzom/server/src/gpm_service/messages.cpp | 1 - .../src/input_output_service/input_output_service.cpp | 2 +- ryzom/server/src/input_output_service/messages.cpp | 3 +-- ryzom/server/src/input_output_service/stdpch.h | 1 - ryzom/server/src/mirror_service/mirror_service.cpp | 2 +- ryzom/server/src/monitor_service/service_main.cpp | 2 +- ryzom/server/src/patchman_service/service_main.cpp | 2 +- ryzom/server/src/pd_support_service/service_main.cpp | 2 +- ryzom/server/src/tick_service/tick_service.cpp | 2 +- 17 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ryzom/common/src/game_share/ryzom_version.h b/ryzom/common/src/game_share/ryzom_version.h index 2dd050042..4653a994e 100644 --- a/ryzom/common/src/game_share/ryzom_version.h +++ b/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 diff --git a/ryzom/server/src/ai_service/service_main.cpp b/ryzom/server/src/ai_service/service_main.cpp index 4aef891fa..38f2756fa 100644 --- a/ryzom/server/src/ai_service/service_main.cpp +++ b/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)) diff --git a/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp b/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp index af58fef23..b323a32b2 100644 --- a/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp +++ b/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); diff --git a/ryzom/server/src/entities_game_service/entities_game_service.cpp b/ryzom/server/src/entities_game_service/entities_game_service.cpp index a12548195..ef6873690 100644 --- a/ryzom/server/src/entities_game_service/entities_game_service.cpp +++ b/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"); diff --git a/ryzom/server/src/frontend_service/frontend_service.cpp b/ryzom/server/src/frontend_service/frontend_service.cpp index 774eb4396..b8411db96 100644 --- a/ryzom/server/src/frontend_service/frontend_service.cpp +++ b/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..." ); diff --git a/ryzom/server/src/general_utilities_service/service_main.cpp b/ryzom/server/src/general_utilities_service/service_main.cpp index 4f1deba82..b3f2a9584 100644 --- a/ryzom/server/src/general_utilities_service/service_main.cpp +++ b/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) diff --git a/ryzom/server/src/gpm_service/client_messages.cpp b/ryzom/server/src/gpm_service/client_messages.cpp index def228c12..8f81351a8 100644 --- a/ryzom/server/src/gpm_service/client_messages.cpp +++ b/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" diff --git a/ryzom/server/src/gpm_service/gpm_service.cpp b/ryzom/server/src/gpm_service/gpm_service.cpp index 1bd6a38f4..90ca5dee5 100644 --- a/ryzom/server/src/gpm_service/gpm_service.cpp +++ b/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; diff --git a/ryzom/server/src/gpm_service/messages.cpp b/ryzom/server/src/gpm_service/messages.cpp index f0cadcacd..282564c6d 100644 --- a/ryzom/server/src/gpm_service/messages.cpp +++ b/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; diff --git a/ryzom/server/src/input_output_service/input_output_service.cpp b/ryzom/server/src/input_output_service/input_output_service.cpp index 6bae7f8e7..f0382589d 100644 --- a/ryzom/server/src/input_output_service/input_output_service.cpp +++ b/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); diff --git a/ryzom/server/src/input_output_service/messages.cpp b/ryzom/server/src/input_output_service/messages.cpp index 4af959590..2ff70482f 100644 --- a/ryzom/server/src/input_output_service/messages.cpp +++ b/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 */ diff --git a/ryzom/server/src/input_output_service/stdpch.h b/ryzom/server/src/input_output_service/stdpch.h index 67599f732..6953ac24b 100644 --- a/ryzom/server/src/input_output_service/stdpch.h +++ b/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" diff --git a/ryzom/server/src/mirror_service/mirror_service.cpp b/ryzom/server/src/mirror_service/mirror_service.cpp index ed71e7269..6b87f6656 100644 --- a/ryzom/server/src/mirror_service/mirror_service.cpp +++ b/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; diff --git a/ryzom/server/src/monitor_service/service_main.cpp b/ryzom/server/src/monitor_service/service_main.cpp index 0949e623b..15294f63a 100644 --- a/ryzom/server/src/monitor_service/service_main.cpp +++ b/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(); diff --git a/ryzom/server/src/patchman_service/service_main.cpp b/ryzom/server/src/patchman_service/service_main.cpp index 42659f7bc..2958ce179 100644 --- a/ryzom/server/src/patchman_service/service_main.cpp +++ b/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 diff --git a/ryzom/server/src/pd_support_service/service_main.cpp b/ryzom/server/src/pd_support_service/service_main.cpp index da2024f8c..272d1d922 100644 --- a/ryzom/server/src/pd_support_service/service_main.cpp +++ b/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) diff --git a/ryzom/server/src/tick_service/tick_service.cpp b/ryzom/server/src/tick_service/tick_service.cpp index cb510862c..3888008b3 100644 --- a/ryzom/server/src/tick_service/tick_service.cpp +++ b/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;