From de4aff6d9cf3d3f0735a00e5a4547b0157351fa2 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 13 Feb 2014 22:03:02 +0100 Subject: [PATCH] Add configuration for shard data used with patchman --- workspace/projects.py | 24 ++++--- workspace/shard/data_language/directories.py | 66 +++++++++++++++++++ workspace/shard/data_language/process.py | 44 +++++++++++++ .../data_shard/directories.py | 8 +-- .../{common => shard}/data_shard/process.py | 6 +- 5 files changed, 130 insertions(+), 18 deletions(-) create mode 100644 workspace/shard/data_language/directories.py create mode 100644 workspace/shard/data_language/process.py rename workspace/{common => shard}/data_shard/directories.py (90%) rename workspace/{common => shard}/data_shard/process.py (87%) diff --git a/workspace/projects.py b/workspace/projects.py index 342ba55..916cc38 100644 --- a/workspace/projects.py +++ b/workspace/projects.py @@ -46,10 +46,13 @@ ProjectsToProcess += [ "common/fonts" ] ProjectsToProcess += [ "common/gamedev" ] ProjectsToProcess += [ "common/leveldesign" ] ProjectsToProcess += [ "common/data_common" ] -ProjectsToProcess += [ "common/data_shard" ] ProjectsToProcess += [ "common/exedll" ] ProjectsToProcess += [ "common/cfg" ] +# Shard specific +ProjectsToProcess += [ "shard/data_shard" ] +ProjectsToProcess += [ "shard/data_language" ] + # Ecosystem projects ProjectsToProcess += [ "ecosystems/desert" ] ProjectsToProcess += [ "ecosystems/jungle" ] @@ -66,17 +69,18 @@ ProjectsToProcess += [ "continents/indoors" ] # Note: must be after other contin InstallShardDataDirectories = [ ] -InstallShardDataDirectories += [ "data_shard" ] InstallShardDataDirectories += [ "data_common" ] +InstallShardDataDirectories += [ "data_language" ] -InstallShardDataCollisionsDirectory = "data_shard/collisions" -InstallShardDataCollisionsDirectories = [ ] -InstallShardDataCollisionsDirectories += [ "newbieland_ai" ] -InstallShardDataCollisionsDirectories += [ "newbieland_ig" ] -InstallShardDataCollisionsDirectories += [ "newbieland_pacs" ] -InstallShardDataCollisionsDirectories += [ "indoors_ai" ] -InstallShardDataCollisionsDirectories += [ "indoors_ig" ] -InstallShardDataCollisionsDirectories += [ "indoors_pacs" ] +InstallShardDataMultiDirectories = [ ] +InstallShardDataMultiDirectories += [ [ "cfg", [ "data_shard" ] ] ] +InstallShardDataMultiDirectories += [ [ "data_newbieland", [ "newbieland_ai", "newbieland_ig", "newbieland_pacs" ] ] ] +InstallShardDataMultiDirectories += [ [ "data_indoors", [ "indoors_ai", "indoors_ig", "indoors_pacs" ] ] ] +InstallShardDataMultiDirectories += [ [ "data_pacs_prim", [ "desert_pacs_prim", "jungle_pacs_prim", "lacustre_pacs_prim", "primes_racines_pacs_prim" ] ] ] + +InstallShardDataPrimitivesDirectories = [ ] +InstallShardDataPrimitivesDirectories += [ [ "data_mainland_common_primitives", [ "" ] ] ] +InstallShardDataPrimitivesDirectories += [ [ "data_newbieland_primitives", [ "newbieland" ] ] ] InstallClientData = [ ] diff --git a/workspace/shard/data_language/directories.py b/workspace/shard/data_language/directories.py new file mode 100644 index 0000000..3839326 --- /dev/null +++ b/workspace/shard/data_language/directories.py @@ -0,0 +1,66 @@ +#!/usr/bin/python +# +# \file directories.py +# \brief Directories configuration +# \date 2014-02-13 20:32GMT +# \author Jan Boon (Kaetemi) +# Python port of game data build pipeline. +# Directories configuration. +# +# NeL - MMORPG Framework +# Copyright (C) 2014 by authors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# + +from buildsite import * +import os + +# *** COMMON NAMES AND PATHS *** +CommonName = "data_language" +CommonPath = "shard/" + CommonName + + +# *** DIRECT SOURCE DIRECTORIES *** + +# Copy dir directories +CopyDirectSourceDirectories = [ ] +CopyDirectSourceFiles = [ ] +translationFileList = os.listdir(TranslationDirectory + "/translated") +for fileName in translationFileList: + if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*": + if fileName.endswith(".txt"): + CopyDirectSourceFiles += [ TranslationDirectory + "/translated/" + fileName ] + + +# *** SOURCE DIRECTORIES IN LEVELDESIGN *** +CopyLeveldesignSourceDirectories = [ ] +CopyLeveldesignSourceFiles = [ ] +CopyLeveldesignWorldSourceDirectories = [ ] +CopyLeveldesignWorldSourceFiles = [ ] +CopyLeveldesignDfnSourceDirectories = [ ] +CopyLeveldesignDfnSourceFiles = [ ] + + +# *** SOURCE DIRECTORIES IN THE DATABASE *** + +# Copy dir directories +CopyDatabaseSourceDirectories = [ ] +CopyDatabaseSourceFiles = [ ] + + +# *** INSTALL DIRECTORIES IN THE CLIENT DATA *** + +# Common data install directory +CopyInstallDirectory = CommonName diff --git a/workspace/shard/data_language/process.py b/workspace/shard/data_language/process.py new file mode 100644 index 0000000..c796dca --- /dev/null +++ b/workspace/shard/data_language/process.py @@ -0,0 +1,44 @@ +#!/usr/bin/python +# +# \file config.py +# \brief Process configuration +# \date 2014-02-13 20:32GMT +# \author Jan Boon (Kaetemi) +# Python port of game data build pipeline. +# Process configuration. +# +# NeL - MMORPG Framework +# Copyright (C) 2014 by authors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# + +# *** PROCESS CONFIGURATION *** + +# *** PROCESS CONFIG *** +ProcessToComplete = [ ] +ProcessToComplete += [ "copy" ] + + +# *** COMMON NAMES AND PATHS *** +CommonName = "data_language" +CommonPath = "shard/" + CommonName + + +# *** PACS PRIM LIST OPTIONS *** + + +# *** COPY DIR OPTIONS *** + + diff --git a/workspace/common/data_shard/directories.py b/workspace/shard/data_shard/directories.py similarity index 90% rename from workspace/common/data_shard/directories.py rename to workspace/shard/data_shard/directories.py index a7458f6..7316900 100644 --- a/workspace/common/data_shard/directories.py +++ b/workspace/shard/data_shard/directories.py @@ -2,15 +2,13 @@ # # \file directories.py # \brief Directories configuration -# \date 2010-08-27 17:13GMT +# \date 2014-02-13 20:32GMT # \author Jan Boon (Kaetemi) -# \date 2001-2005 -# \author Nevrax # Python port of game data build pipeline. # Directories configuration. # # NeL - MMORPG Framework -# Copyright (C) 2010 Winch Gate Property Limited +# Copyright (C) 2014 by authors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -31,7 +29,7 @@ import os # *** COMMON NAMES AND PATHS *** CommonName = "data_shard" -CommonPath = "common/" + CommonName +CommonPath = "shard/" + CommonName # *** DIRECT SOURCE DIRECTORIES *** diff --git a/workspace/common/data_shard/process.py b/workspace/shard/data_shard/process.py similarity index 87% rename from workspace/common/data_shard/process.py rename to workspace/shard/data_shard/process.py index 54e5e14..ac4053c 100644 --- a/workspace/common/data_shard/process.py +++ b/workspace/shard/data_shard/process.py @@ -2,13 +2,13 @@ # # \file config.py # \brief Process configuration -# \date 2010-08-27 17:02GMT +# \date 2014-02-13 20:32GMT # \author Jan Boon (Kaetemi) # Python port of game data build pipeline. # Process configuration. # # NeL - MMORPG Framework -# Copyright (C) 2010 Winch Gate Property Limited +# Copyright (C) 2014 by authors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -33,7 +33,7 @@ ProcessToComplete += [ "copy" ] # *** COMMON NAMES AND PATHS *** CommonName = "data_shard" -CommonPath = "common/" + CommonName +CommonPath = "shard/" + CommonName # *** PACS PRIM LIST OPTIONS ***