Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-21 15:07:14 +01:00
parent b1849e9859
commit b8225c4fef
7 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/server/src/admin_modules/CMakeLists.txt
View file

@ -15,4 +15,7 @@ IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_adminmodules ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF(WITH_PCH)
INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
ENDIF()

4
code/ryzom/server/src/backup_service/backup_file_access.cpp
View file

@ -36,7 +36,7 @@ NLMISC::CVariable<std::string> BSFileSubst("backup", "BSFileSubst", "file read/w
NLMISC::CVariable<bool> VerboseLog("backup", "VerboseLog", "Activate verbose logging of BS activity", false);
NLMISC::CVariable<bool> UseTempFile("backup", "UseTempFile", "Flag the use of temporary file for safe write or append operation", true, true);
extern NLMISC::CVariable<std::string> SaveShardRootBackupService;
extern NLMISC::CVariable<std::string> SaveShardRootGameShare;
bool bsstrincmp(const char* s1, const char* s2, int n)
{
@ -48,7 +48,7 @@ bool bsstrincmp(const char* s1, const char* s2, int n)
std::string getBackupFileName(const std::string& filename)
{
return SaveShardRootBackupService.get() + filename;
return SaveShardRootGameShare.get() + filename;
/* // BSFilePrefix and BSFileSubst are deprecated
if (BSFilePrefix.get().empty())
return filename;

4
code/ryzom/server/src/backup_service/backup_service.cpp
View file

@ -62,7 +62,7 @@ struct CBackupMsgSaveFileRecv
extern CDirectoryRateStat DirStats;
extern NLMISC::CVariable<std::string> SaveShardRootBackupService;
extern NLMISC::CVariable<std::string> SaveShardRootGameShare;
using namespace NLNET;
using namespace NLMISC;
@ -542,7 +542,7 @@ static CMessage getFileClassImp( CMessage& msgin)
}
}
// In case something like getPathContent() has returned full paths, make paths relative to match the requested filenames
fdc.stripFilename(SaveShardRootBackupService.get());
fdc.stripFilename(SaveShardRootGameShare.get());
// compose the output message
CMessage msgout("BS_FILE_CLASS");

8
code/ryzom/server/src/backup_service/commands.cpp
View file

@ -30,7 +30,7 @@ using namespace NLNET;
CDirectoryRateStat DirStats;
extern CVariable<string> SaveShardRootBackupService;
extern CVariable<string> SaveShardRootGameShare;
NLMISC_COMMAND(displayFileStats, "display file read/write stats for the last minute", "")
@ -74,9 +74,9 @@ NLMISC_COMMAND ( dumpCharacterFile, "dump the content of the save file for a cha
{
// just output the list of available shard id
vector<string> shards;
CPath::getPathContent(SaveShardRootBackupService, false, true, false, shards);
CPath::getPathContent(SaveShardRootGameShare, false, true, false, shards);
log.displayNL("Listing %u available shard id in path '%s':", shards.size(), SaveShardRootBackupService.c_str());
log.displayNL("Listing %u available shard id in path '%s':", shards.size(), SaveShardRootGameShare.c_str());
for (uint i=0; i<shards.size(); ++i)
{
string id = shards[i];
@ -107,7 +107,7 @@ NLMISC_COMMAND ( dumpCharacterFile, "dump the content of the save file for a cha
useFilter = true;
}
string fileName = SaveShardRootBackupService.toString()+"/"+args[0]+"/characters/account_"+args[1]+"_"+args[2]+"_pdr.bin";
string fileName = SaveShardRootGameShare.toString()+"/"+args[0]+"/characters/account_"+args[1]+"_"+args[2]+"_pdr.bin";
if (!CFile::isExists(fileName))
{
log.displayNL("The file '%s' (located here '%s') cannot be found in '%s' backup directory",

9
code/ryzom/server/src/backup_service/web_connection.cpp
View file

@ -169,7 +169,8 @@ void cbOnSaveShardRootModified( NLMISC::IVariable& var )
}
CVariable<string> IncrementalBackupDirectory("backup", "IncrementalBackupDirectory", "Directory to find incremental backuped archives", "", 0, true);
CVariable<string> SaveShardRootBackupService("backup", "SaveShardRoot", "Root directory of all saved data by BS", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file)
//CVariable<string> SaveShardRootBackupService("backup", "SaveShardRoot", "Root directory of all saved data by BS", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file)
extern CVariable<string> SaveShardRootGameShare;
CVariable<string> SaveTemplatePath("backup", "SaveTemplatePath", "Directory to find saves (with shard and account replacement strings)", "$shard/characters/account_$userid_$charid$ext", 0, true);
CVariable<string> SaveExtList("backup", "SaveExtList", "List of possible extensions for save files (space separated)", "_pdr.bin _pdr.xml .bin", 0, true);
@ -209,7 +210,7 @@ void cbGetSaveList(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true);
string incrementalDir = IncrementalBackupDirectory.get();
string saveShardRoot = SaveShardRootBackupService.get();
string saveShardRoot = SaveShardRootGameShare.get();
string templatePath = SaveTemplatePath.get();
string extList = SaveExtList.get();
@ -292,7 +293,7 @@ void cbRestoreSave(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true);
string saveShardRoot = SaveShardRootBackupService.get();
string saveShardRoot = SaveShardRootGameShare.get();
string templatePath = SaveTemplatePath.get();
string shard;
@ -367,7 +368,7 @@ void cbCopyOverSave(CMemStream &msgin, TSockId host)
explode(str, string("%%"), params, true);
string saveShardRoot = SaveShardRootBackupService.get();
string saveShardRoot = SaveShardRootGameShare.get();
string templatePath = SaveTemplatePath.get();
string extList = SaveExtList.get();

5
code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
View file

@ -11,4 +11,7 @@ NL_ADD_LIB_SUFFIX(ryzom_gameplaymodule)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_gameplaymodule LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
INSTALL(TARGETS ryzom_gameplaymodule LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
ENDIF()

5
code/ryzom/server/src/pd_lib/CMakeLists.txt
View file

@ -16,4 +16,7 @@ NL_ADD_LIB_SUFFIX(ryzom_pd)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_pd LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
INSTALL(TARGETS ryzom_pd LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
ENDIF()