aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 23:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
vl 2010-06-08 18:01:58 +02:00
commit 09bcc39b6d
15 changed files with 143 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,29 +1,30 @@
# Supporting modules and libraries.
ADD_SUBDIRECTORY(admin_modules)
ADD_SUBDIRECTORY(server_share)
ADD_SUBDIRECTORY(ai_share)
ADD_SUBDIRECTORY(gameplay_module_lib)
ADD_SUBDIRECTORY(pd_lib)
ADD_SUBDIRECTORY(frontend_service)
ADD_SUBDIRECTORY(entities_game_service)
# Ryzom Services
ADD_SUBDIRECTORY(ai_service)
ADD_SUBDIRECTORY(backup_service)
ADD_SUBDIRECTORY(dynamic_scenario_service)
ADD_SUBDIRECTORY(entities_game_service)
ADD_SUBDIRECTORY(frontend_service)
ADD_SUBDIRECTORY(gpm_service)
ADD_SUBDIRECTORY(input_output_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)
#ags_test
#
#
#
#
#gpm_service
#input_output_service
#
#log_analyser_service
#logger_service
#mail_forum_service

24
code/ryzom/server/src/gpm_service/CMakeLists.txt Normal file
View file

@ -0,0 +1,24 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(gpm_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(gpm_service admin_modules
game_share
server_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELPACS_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(gpm_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Global Position Manager Service (GPMS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS gpm_service RUNTIME DESTINATION sbin COMPONENT services)

35
code/ryzom/server/src/input_output_service/CMakeLists.txt Normal file
View file

@ -0,0 +1,35 @@
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/ios_chat_log.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ios_chat_log.h
${CMAKE_CURRENT_SOURCE_DIR}/ios_chat_log_inline.h
${CMAKE_CURRENT_SOURCE_DIR}/ios_pd.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ios_pd.h
${CMAKE_CURRENT_SOURCE_DIR}/ios_pd_inline.h)
ADD_EXECUTABLE(ios_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ios_service admin_modules
pd_lib
game_share
server_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELPACS_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(ios_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Input Ouput Service (IOS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ios_service RUNTIME DESTINATION sbin COMPONENT services)

31
code/ryzom/server/src/patchman_service/CMakeLists.txt Normal file
View file

@ -0,0 +1,31 @@
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ file_repository.h
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h)
ADD_EXECUTABLE(patchman_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(patchman_service admin_modules
game_share
server_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
${NELMISC_LIBRARY}
${NELNET_LIBRARY}
${NELPACS_LIBRARY}
${NELGEORGES_LIBRARY}
${NELLIGO_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(patchman_service PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Patch Manager (PMS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS patchman_service RUNTIME DESTINATION sbin COMPONENT services)

2
code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.h
View file

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

2
code/ryzom/server/src/patchman_service/file_receiver.h
View file

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

2
code/ryzom/server/src/patchman_service/file_repository.h
View file

@ -45,7 +45,7 @@
#include "nel/net/module_builder_parts.h"
// game share
#include "game_share/deployment_configuration.h"
//#include "game_share/deployment_configuration.h"
// local
#include "module_admin_itf.h"

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

@ -14,5 +14,5 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "game_share/mysql_wrapper.cpp"
#include "server_share/mysql_wrapper.cpp"

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

@ -36,11 +36,14 @@
using namespace std;
using namespace NLMISC;
//-------------------------------------------------------------------------------------------------
// constants & utilities
//-------------------------------------------------------------------------------------------------
// From spa_server_patch_applier.cpp
extern void writeVersionFile(const NLMISC::CSString& fileName, uint32 version);
extern uint32 readVersionFile(const NLMISC::CSString& fileName);
NLMISC::CSString getRepositoryIndexFileName(const NLMISC::CSString& repositoryName)
{
return "repository_"+repositoryName+".idx";
@ -380,7 +383,7 @@ CRepository::const_iterator CRepository::end() const
return _Files.end();
}
void CRepository::fillShortList(TFileInfoVector &files) const
void CRepository::fillShortList(PATCHMAN::TFileInfoVector &files) const
{
// start by clearing out any previous contents in the files vector
files.clear();

2
code/ryzom/server/src/patchman_service/repository.h
View file

@ -110,7 +110,7 @@ public:
iterator end();
const_iterator end() const;
void fillShortList(TFileInfoVector &files) const;
void fillShortList(PATCHMAN::TFileInfoVector &files) const;
private:

3
code/ryzom/tools/CMakeLists.txt
View file

@ -11,11 +11,12 @@ ADD_SUBDIRECTORY(pdr_util)
ADD_SUBDIRECTORY(stats_scan)
ADD_SUBDIRECTORY(sheets_packer)
ADD_SUBDIRECTORY(server)
# Old stuff that doesn't compile anymore.
#ADD_SUBDIRECTORY(occ2huff)
#ADD_SUBDIRECTORY(phrase_generator)
#ADD_SUBDIRECTORY(sheet_random_generator)
#- this relies on something in the client
# Not building these
#xml_packer - this is in NeL tools.

2
code/ryzom/tools/assoc_mem/CMakeLists.txt
View file

@ -6,7 +6,7 @@ LIST(REMOVE_ITEM SRC
ADD_EXECUTABLE(assoc_mem ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(assoc_mem ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

11
code/ryzom/tools/server/CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
# Deprecated, no longer used
#ADD_SUBDIRECTORY(ai_build_wmap)
# Not done yet.
#admin
#brick_param_extractor
#build_spell_sheet
#build_world_packed_col
#CMakeLists.txt
#sql
#www

17
code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt Normal file
View file

@ -0,0 +1,17 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ai_build_wmap ${SRC})
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/server/src
${CMAKE_SOURCE_DIR}/common/src
${LIBXML2_INCLUDE_DIR}
${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ai_build_wmap game_share
server_share
ai_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY})
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION bin COMPONENT tools)

3
code/ryzom/tools/server/ai_build_wmap/build_proximity_maps.cpp
View file

@ -24,9 +24,10 @@
#include "nel/misc/command.h"
#include "nel/misc/path.h"
#include "nel/misc/sstring.h"
#include "nel/misc/file.h"
// Game share
#include "game_share/bmp4image.h"
#include "server_share/bmp4image.h"
// AI share
#include "ai_share/world_map.h"