From 46ab8acea7b8b293a2d59e74903f07fd8f8844d8 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 13 Feb 2014 22:02:25 +0100 Subject: [PATCH 1/6] Extend shard data script --- code/nel/tools/build_gamedata/8_shard_data.py | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/code/nel/tools/build_gamedata/8_shard_data.py b/code/nel/tools/build_gamedata/8_shard_data.py index 8ab628875..7fe65c6f3 100644 --- a/code/nel/tools/build_gamedata/8_shard_data.py +++ b/code/nel/tools/build_gamedata/8_shard_data.py @@ -47,14 +47,28 @@ printLog(log, "") for dir in InstallShardDataDirectories: printLog(log, "SHARD DIRECTORY " + dir) - mkPath(log, InstallDirectory + "/" + dir) mkPath(log, ShardInstallDirectory + "/" + dir) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + dir, ShardInstallDirectory + "/" + dir) -for dir in InstallShardDataCollisionsDirectories: - printLog(log, "SHARD COLLISIONS " + dir) + printLog(log, "FROM " + dir) mkPath(log, InstallDirectory + "/" + dir) - mkPath(log, ShardInstallDirectory + "/" + InstallShardDataCollisionsDirectory + "/" + dir) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + dir, ShardInstallDirectory + "/" + InstallShardDataCollisionsDirectory + "/" + dir) + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + dir, ShardInstallDirectory + "/" + dir) +for multiDir in InstallShardDataMultiDirectories: + dstDir = multiDir[0] + mkPath(log, ShardInstallDirectory + "/" + dstDir) + printLog(log, "SHARD DIRECTORY " + dstDir) + for srcDir in multiDir[1]: + printLog(log, "FROM " + srcDir) + mkPath(log, InstallDirectory + "/" + srcDir) + mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) +for multiDir in InstallShardDataPrimitivesDirectories: + dstDir = multiDir[0] + mkPath(log, ShardInstallDirectory + "/" + dstDir) + printLog(log, "SHARD DIRECTORY " + dstDir) + for srcDir in multiDir[1]: + printLog(log, "FROM PRIMITIVES " + srcDir) + mkPath(log, PrimitivesDirectory + "/" + srcDir) + mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) + copyFilesNoTreeIfNeeded(log, PrimitivesDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) printLog(log, "") log.close() From 3860006530888033cd9bd21b1225c7e0598283ba Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 14 Feb 2014 01:01:02 +0100 Subject: [PATCH 2/6] Add directories for patchman to gamedata setup --- code/nel/tools/build_gamedata/0_setup.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/code/nel/tools/build_gamedata/0_setup.py b/code/nel/tools/build_gamedata/0_setup.py index 63c9c4f6f..9c66d369c 100644 --- a/code/nel/tools/build_gamedata/0_setup.py +++ b/code/nel/tools/build_gamedata/0_setup.py @@ -159,6 +159,22 @@ if not args.noconf: WindowsExeDllCfgDirectories except NameError: WindowsExeDllCfgDirectories = [ 'C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86', 'D:/libraries/external/bin', 'R:/build/dev/bin/Release', 'R:/code/ryzom/client', 'R:/code/nel/lib', 'R:/code/ryzom/bin', 'R:/code/ryzom/tools/client/client_config/bin' ] + try: + LinuxServiceExecutableDirectory + except NameError: + LinuxServiceExecutableDirectory = "S:/devls_x64/bin" + try: + LinuxClientExecutableDirectory + except NameError: + LinuxClientExecutableDirectory = "S:/devl_x64/bin" + try: + PatchmanCfgAdminDirectory + except NameError: + PatchmanCfgAdminDirectory = "S:/notes/patchman_cfg/admin_install" + try: + PatchmanCfgDefaultDirectory + except NameError: + PatchmanCfgDefaultDirectory = "S:/notes/patchman_cfg/default" try: MaxAvailable except NameError: @@ -219,6 +235,10 @@ if not args.noconf: WindowsExeDllCfgDirectories[4] = askVar(log, "Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/") WindowsExeDllCfgDirectories[5] = askVar(log, "Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/") WindowsExeDllCfgDirectories[6] = askVar(log, "Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/") + LinuxServiceExecutableDirectory = askVar(log, "Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/") + LinuxClientExecutableDirectory = askVar(log, "Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/") + PatchmanCfgAdminDirectory = askVar(log, "Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/") + PatchmanCfgDefaultDirectory = askVar(log, "Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/") MaxAvailable = int(askVar(log, "3dsMax Available", str(MaxAvailable))) if MaxAvailable: MaxDirectory = askVar(log, "3dsMax Directory", MaxDirectory).replace("\\", "/") @@ -299,6 +319,10 @@ if not args.noconf: sf.write("DataCommonDirectory = \"" + str(DataCommonDirectory) + "\"\n") sf.write("DataShardDirectory = \"" + str(DataShardDirectory) + "\"\n") sf.write("WindowsExeDllCfgDirectories = " + str(WindowsExeDllCfgDirectories) + "\n") + sf.write("LinuxServiceExecutableDirectory = \"" + str(LinuxServiceExecutableDirectory) + "\"\n") + sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n") + sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n") + sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n") sf.write("\n") sf.write("# 3dsMax directives\n") sf.write("MaxAvailable = " + str(MaxAvailable) + "\n") From 93a6e13d5e435c59ed6417d6ec79cd3fd9854ad4 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 14 Feb 2014 01:21:05 +0100 Subject: [PATCH 3/6] Extend shard data script to gather executables and configurations --- code/nel/tools/build_gamedata/8_shard_data.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/nel/tools/build_gamedata/8_shard_data.py b/code/nel/tools/build_gamedata/8_shard_data.py index 7fe65c6f3..f0f921cc7 100644 --- a/code/nel/tools/build_gamedata/8_shard_data.py +++ b/code/nel/tools/build_gamedata/8_shard_data.py @@ -69,6 +69,16 @@ for multiDir in InstallShardDataPrimitivesDirectories: mkPath(log, PrimitivesDirectory + "/" + srcDir) mkPath(log, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) copyFilesNoTreeIfNeeded(log, PrimitivesDirectory + "/" + srcDir, ShardInstallDirectory + "/" + dstDir + "/" + srcDir) +for execDir in InstallShardDataExecutables: + dstDir = execDir[0] + mkPath(log, LinuxServiceExecutableDirectory) + mkPath(log, PatchmanCfgDefaultDirectory) + mkPath(log, InstallDirectory) + mkPath(log, ShardInstallDirectory + "/" + dstDir) + printLog(log, "SHARD DIRECTORY " + dstDir) + copyFileIfNeeded(log, LinuxServiceExecutableDirectory + "/" + execDir[1][1], ShardInstallDirectory + "/" + dstDir + "/" + execDir[1][0]) + copyFileListNoTree(log, PatchmanCfgDefaultDirectory, ShardInstallDirectory + "/" + dstDir, execDir[2]) + copyFileListNoTree(log, InstallDirectory, ShardInstallDirectory + "/" + dstDir, execDir[3]) printLog(log, "") log.close() From 5a092039f180b9dd5549d4e101a54d8616fb4863 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 14 Feb 2014 01:58:56 +0100 Subject: [PATCH 4/6] Move mirror sheets back in --- .../data_shard/mirror_sheets/fame.dataset | 741 ++++++++++++++++++ .../data_shard/mirror_sheets/fe_temp.dataset | 365 +++++++++ .../data_shard/mirror_sheets/pet.dataset | 47 ++ 3 files changed, 1153 insertions(+) create mode 100644 code/ryzom/server/data_shard/mirror_sheets/fame.dataset create mode 100644 code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset create mode 100644 code/ryzom/server/data_shard/mirror_sheets/pet.dataset diff --git a/code/ryzom/server/data_shard/mirror_sheets/fame.dataset b/code/ryzom/server/data_shard/mirror_sheets/fame.dataset new file mode 100644 index 000000000..d24691d63 --- /dev/null +++ b/code/ryzom/server/data_shard/mirror_sheets/fame.dataset @@ -0,0 +1,741 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fri Dec 12 14:17:11 2003 (saffray) .entity types[1] = 13 +Fri Dec 12 14:17:11 2003 (saffray) .entity types[2] = 14 + diff --git a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset new file mode 100644 index 000000000..f88263c27 --- /dev/null +++ b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset @@ -0,0 +1,365 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/server/data_shard/mirror_sheets/pet.dataset b/code/ryzom/server/data_shard/mirror_sheets/pet.dataset new file mode 100644 index 000000000..238a38dbd --- /dev/null +++ b/code/ryzom/server/data_shard/mirror_sheets/pet.dataset @@ -0,0 +1,47 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From f4a4a41fbff236250717c692cb0b1d8ac85d53b7 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 14 Feb 2014 02:03:22 +0100 Subject: [PATCH 5/6] Fix default directory --- code/nel/tools/build_gamedata/0_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/tools/build_gamedata/0_setup.py b/code/nel/tools/build_gamedata/0_setup.py index 9c66d369c..85c070893 100644 --- a/code/nel/tools/build_gamedata/0_setup.py +++ b/code/nel/tools/build_gamedata/0_setup.py @@ -134,7 +134,7 @@ if not args.noconf: try: DataShardDirectory except NameError: - DataShardDirectory = "R:/code/ryzom/common/data_shard" + DataShardDirectory = "R:/code/ryzom/server/data_shard" try: DataCommonDirectory except NameError: From ca2d7941f85ef470dea2e86dfc50cd6c3e38f797 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 14 Feb 2014 02:37:41 +0100 Subject: [PATCH 6/6] Get path for datasets from config like other services --- code/ryzom/server/src/tick_service/range_mirror_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/server/src/tick_service/range_mirror_manager.cpp b/code/ryzom/server/src/tick_service/range_mirror_manager.cpp index 1d233c8e5..14a2e8e85 100644 --- a/code/ryzom/server/src/tick_service/range_mirror_manager.cpp +++ b/code/ryzom/server/src/tick_service/range_mirror_manager.cpp @@ -145,7 +145,7 @@ void CRangeMirrorManager::init() // Load datasets into temporary map to get the names TSDataSetSheets sDataSetSheets; - loadForm( "dataset", "data_shard/datasets.packed_sheets", sDataSetSheets ); + loadForm( "dataset", IService::getInstance()->WriteFilesDirectory.toString()+"datasets.packed_sheets", sDataSetSheets ); TSDataSetSheets::iterator ism; for ( ism=sDataSetSheets.begin(); ism!=sDataSetSheets.end(); ++ism ) {