aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 13:01:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1436 Enabled patchman build, fixed its CMakeLists added missing header includes, eliminated static-ness of extern'd functions.

Browse source
This commit is contained in:
sfb 2012-02-29 09:26:31 -06:00
parent 782f3edf03
commit 9a5d240163
9 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/server/src/CMakeLists.txt
View file

@ -27,13 +27,14 @@ ADD_SUBDIRECTORY(persistant_data_service)
ADD_SUBDIRECTORY(session_browser_server)
ADD_SUBDIRECTORY(shard_unifier_service)
ADD_SUBDIRECTORY(tick_service)
ADD_SUBDIRECTORY(patchman_service)
# Deprecated, no longer used.
#ADD_SUBDIRECTORY(ags_test)
#ADD_SUBDIRECTORY(ai_data_service)
#ADD_SUBDIRECTORY(entity_view_service)
#ADD_SUBDIRECTORY(general_utilities_service)
#ADD_SUBDIRECTORY(patchman_service)
# Not sure, no longer used maybe?
#sabrina

20
code/ryzom/server/src/patchman_service/CMakeLists.txt
View file

@ -2,11 +2,25 @@ FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h)
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/spt_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spt_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/spm_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spm_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/spa_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spa_module_itf.h
${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.h
${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.h
${CMAKE_CURRENT_SOURCE_DIR}/stdin_monitor_thread.cpp
${CMAKE_CURRENT_SOURCE_DIR}/stdin_monitor_thread.h)
ADD_EXECUTABLE(ryzom_patchman_service ${SRC})
ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_patchman_service
ryzom_adminmodules

1
code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.cpp
View file

@ -23,6 +23,7 @@
// game share
#include "game_share/utils.h"
#include "game_share/deployment_configuration.h"
// local
#include "deployment_configuration_synchroniser.h"

1
code/ryzom/server/src/patchman_service/log_report_module.cpp
View file

@ -26,6 +26,7 @@
// game_share
#include "game_share/utils.h"
#include "game_share/deployment_configuration.h"
// patchman
#include "administered_module.h"

4
code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp
View file

@ -27,7 +27,7 @@
// game share
#include "game_share/utils.h"
#include "game_share/file_description_container.h"
#include "game_share/deployment_configuration.h"
// local
#include "administered_module.h"
#include "file_receiver.h"
@ -263,7 +263,7 @@ void CPatchmanAdminModule::cbFileDownloadSuccess(const CSString& fileName,const
NLMISC::CPath::setCurrentPath(oldDirectory.c_str());
time_t rawtime;
nl_time ( &rawtime );
setStateVariable("Environment",NLMISC::toString("Updated %s",nl_asctime (nl_localtime ( &rawtime ))));
setStateVariable("Environment",NLMISC::toString("Updated %s",asctime (nl_localtime ( &rawtime ))));
return;
}

7
code/ryzom/server/src/patchman_service/service_main.cpp
View file

@ -28,13 +28,18 @@
#include "game_share/ryzom_version.h"
#include "game_share/tick_event_handler.h"
#include "game_share/singleton_registry.h"
#include "game_share/handy_commands.h"
#include "server_share/handy_commands.h"
#include "game_share/utils.h"
// local
#include "service_main.h"
#include "patchman_tester.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
#endif // NL_OS_WINDOWS
//-----------------------------------------------------------------------------
// namespaces

5
code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp
View file

@ -25,6 +25,7 @@
// game share
#include "game_share/utils.h"
#include "game_share/file_description_container.h"
#include "game_share/deployment_configuration.h"
// local
#include "administered_module.h"
@ -214,7 +215,7 @@ static bool untar(const NLMISC::CSString& tarFile,const NLMISC::CSString& destin
return ok;
}
static uint32 readVersionFile(const NLMISC::CSString& fileName)
uint32 readVersionFile(const NLMISC::CSString& fileName)
{
if (!NLMISC::CFile::fileExists(fileName))
{
@ -226,7 +227,7 @@ static uint32 readVersionFile(const NLMISC::CSString& fileName)
return s.strip().atoi();
}
static void writeVersionFile(const NLMISC::CSString& fileName, uint32 version)
void writeVersionFile(const NLMISC::CSString& fileName, uint32 version)
{
NLMISC::CSString(NLMISC::toString(version)).writeToFile(fileName);
}

2
code/ryzom/server/src/patchman_service/spm_server_patch_manager.cpp
View file

@ -32,7 +32,7 @@
#include "deployment_configuration_synchroniser.h"
#include "patchman_constants.h"
#include "game_share/mysql_wrapper.h"
#include "server_share/mysql_wrapper.h"
//-------------------------------------------------------------------------------------------------

3
code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp
View file

@ -27,6 +27,7 @@
// game share
#include "game_share/utils.h"
#include "game_share/deployment_configuration.h"
// local
#include "module_admin_itf.h"
@ -783,7 +784,7 @@ NLMISC_CLASS_COMMAND_IMPL(CServerPatchTerminal, depDevCfg)
CSString batch;
// hack the cmd line
CVectorSString cmdParams;
explode(appDesc.CmdLine, " ", reinterpret_cast<vector<string>&>(cmdParams), true);
explode(string(appDesc.CmdLine), string(" "), reinterpret_cast<vector<string>&>(cmdParams), true);
for (uint i=0; i<cmdParams.size(); ++i)
{
string &p = cmdParams[i];