From 3d9cb17d0531cd59bde119f807b8da674e1636e3 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 8 Feb 2014 22:07:53 +0100 Subject: [PATCH] Move properties cfg search paths to python variable --- workspace/common/construction/directories.py | 10 ++++ .../common/construction/properties_base.cfg | 14 ----- workspace/common/outgame/directories.py | 10 ++++ workspace/common/outgame/properties_base.cfg | 14 ----- workspace/common/sky/directories.py | 10 ++++ workspace/common/sky/properties_base.cfg | 14 ----- workspace/continents/indoors/directories.py | 6 +++ .../continents/indoors/properties_base.cfg | 51 ------------------- .../continents/newbieland/directories.py | 6 +++ .../continents/newbieland/properties_base.cfg | 29 ----------- 10 files changed, 42 insertions(+), 122 deletions(-) diff --git a/workspace/common/construction/directories.py b/workspace/common/construction/directories.py index 68bf17a..e759988 100644 --- a/workspace/common/construction/directories.py +++ b/workspace/common/construction/directories.py @@ -86,6 +86,16 @@ MapLookupDirectories = [ ] MapLookupDirectories += [ CommonPath + "/map_export" ] MapLookupDirectories += [ CommonPath + "/map_uncompressed" ] +# Properties search paths +PropertiesExportBuildSearchPaths = [ ] +PropertiesExportBuildSearchPaths += ShapeLookupDirectories +PropertiesExportBuildSearchPaths += MapLookupDirectories +PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ] + # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE *** diff --git a/workspace/common/construction/properties_base.cfg b/workspace/common/construction/properties_base.cfg index 9539f7f..2f5adce 100644 --- a/workspace/common/construction/properties_base.cfg +++ b/workspace/common/construction/properties_base.cfg @@ -3,20 +3,6 @@ bank_name = ""; bankfar_name = ""; -// Search pathes -search_pathes = -{ - "%ExportBuildDirectory%/common/sfx/ps", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_clodtex_build", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_with_coarse_mesh", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_export", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_uncompressed", // Sfx directory - "%ExportBuildDirectory%/common/construction/shape_clodtex_build", // Construction directory - "%ExportBuildDirectory%/common/construction/shape_with_coarse_mesh", // Construction directory - "%ExportBuildDirectory%/common/construction/map_export", // Construction directory - "%ExportBuildDirectory%/common/construction/map_uncompressed", // Construction directory -}; - // Additional ig file name additionnal_ig = { diff --git a/workspace/common/outgame/directories.py b/workspace/common/outgame/directories.py index e0b6435..80ba381 100644 --- a/workspace/common/outgame/directories.py +++ b/workspace/common/outgame/directories.py @@ -86,6 +86,16 @@ MapLookupDirectories = [ ] MapLookupDirectories += [ CommonPath + "/map_export" ] MapLookupDirectories += [ CommonPath + "/map_uncompressed" ] +# Properties search paths +PropertiesExportBuildSearchPaths = [ ] +PropertiesExportBuildSearchPaths += ShapeLookupDirectories +PropertiesExportBuildSearchPaths += MapLookupDirectories +PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ] + # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE *** diff --git a/workspace/common/outgame/properties_base.cfg b/workspace/common/outgame/properties_base.cfg index 952b181..2f5adce 100644 --- a/workspace/common/outgame/properties_base.cfg +++ b/workspace/common/outgame/properties_base.cfg @@ -3,20 +3,6 @@ bank_name = ""; bankfar_name = ""; -// Search pathes -search_pathes = -{ - "%ExportBuildDirectory%/common/sfx/ps", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_clodtex_build", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_with_coarse_mesh", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_export", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_uncompressed", // Sfx directory - "%ExportBuildDirectory%/common/outgame/shape_clodtex_build", // Outgame directory - "%ExportBuildDirectory%/common/outgame/shape_with_coarse_mesh", // Outgame directory - "%ExportBuildDirectory%/common/outgame/map_export", // Outgame directory - "%ExportBuildDirectory%/common/outgame/map_uncompressed", // Outgame directory -}; - // Additional ig file name additionnal_ig = { diff --git a/workspace/common/sky/directories.py b/workspace/common/sky/directories.py index f6babc6..539bbf3 100644 --- a/workspace/common/sky/directories.py +++ b/workspace/common/sky/directories.py @@ -99,6 +99,16 @@ MapLookupDirectories = [ ] MapLookupDirectories += [ CommonPath + "/map_export" ] MapLookupDirectories += [ CommonPath + "/map_uncompressed" ] +# Properties search paths +PropertiesExportBuildSearchPaths = [ ] +PropertiesExportBuildSearchPaths += ShapeLookupDirectories +PropertiesExportBuildSearchPaths += MapLookupDirectories +PropertiesExportBuildSearchPaths += [ "common/sfx/ps" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_clodtex_build" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/shape_with_coarse_mesh" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_export" ] +PropertiesExportBuildSearchPaths += [ "common/sfx/map_uncompressed" ] + # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE *** diff --git a/workspace/common/sky/properties_base.cfg b/workspace/common/sky/properties_base.cfg index 3e48d37..2f5adce 100644 --- a/workspace/common/sky/properties_base.cfg +++ b/workspace/common/sky/properties_base.cfg @@ -3,20 +3,6 @@ bank_name = ""; bankfar_name = ""; -// Search pathes -search_pathes = -{ - "%ExportBuildDirectory%/common/sfx/ps", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_clodtex_build", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_with_coarse_mesh", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_export", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_uncompressed", // Sfx directory - "%ExportBuildDirectory%/common/sky/shape_clodtex_build", // Sky directory - "%ExportBuildDirectory%/common/sky/shape_with_coarse_mesh", // Sky directory - "%ExportBuildDirectory%/common/sky/map_export", // Sky directory - "%ExportBuildDirectory%/common/sky/map_uncompressed", // Sky directory -}; - // Additional ig file name additionnal_ig = { diff --git a/workspace/continents/indoors/directories.py b/workspace/continents/indoors/directories.py index 75a2c5d..3f06b39 100644 --- a/workspace/continents/indoors/directories.py +++ b/workspace/continents/indoors/directories.py @@ -152,6 +152,12 @@ PacsPrimLookupDirectories += [ "ecosystems/desert/pacs_prim" ] PacsPrimLookupDirectories += [ "ecosystems/jungle/pacs_prim" ] PacsPrimLookupDirectories += [ "ecosystems/lacustre/pacs_prim" ] +# Properties search paths +PropertiesExportBuildSearchPaths = [ ] +PropertiesExportBuildSearchPaths += IgLookupDirectories +PropertiesExportBuildSearchPaths += ShapeLookupDirectories +PropertiesExportBuildSearchPaths += MapLookupDirectories + # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE *** diff --git a/workspace/continents/indoors/properties_base.cfg b/workspace/continents/indoors/properties_base.cfg index 5cbc2d8..ec92518 100644 --- a/workspace/continents/indoors/properties_base.cfg +++ b/workspace/continents/indoors/properties_base.cfg @@ -15,57 +15,6 @@ level_design_dfn_directory = "%LeveldesignDfnDirectory%"; bank_name = "%ExportBuildDirectory%/%SmallbankExportDirectory%/%EcosystemName%.smallbank"; bankfar_name = "%ExportBuildDirectory%/%FarbankBuildDirectory%/%EcosystemName%.farbank"; -// Search pathes -search_pathes = -{ - "%ExportBuildDirectory%/common/sfx/ps", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_clodtex_build", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_with_coarse_mesh", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_export", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_uncompressed", // Sfx directory - "%ExportBuildDirectory%/common/construction/shape_clodtex_build", // Construction directory - "%ExportBuildDirectory%/common/construction/shape_with_coarse_mesh", // Construction directory - "%ExportBuildDirectory%/common/construction/map_export", // Construction directory - "%ExportBuildDirectory%/common/construction/map_uncompressed", // Construction directory - "%ExportBuildDirectory%/ecosystems/desert/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/ecosystems/desert/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/ecosystems/desert/map_export", // Map directory - "%ExportBuildDirectory%/ecosystems/desert/map_uncompressed", // Map directory - "%ExportBuildDirectory%/ecosystems/desert/pacs_prim", // PACS PRIM - "%ExportBuildDirectory%/ecosystems/jungle/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/ecosystems/jungle/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/ecosystems/jungle/map_export", // Map directory - "%ExportBuildDirectory%/ecosystems/jungle/map_uncompressed", // Map directory - "%ExportBuildDirectory%/ecosystems/jungle/pacs_prim", // PACS PRIM - "%ExportBuildDirectory%/ecosystems/lacustre/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/ecosystems/lacustre/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/ecosystems/lacustre/map_export", // Map directory - "%ExportBuildDirectory%/ecosystems/lacustre/map_uncompressed", // Map directory - "%ExportBuildDirectory%/ecosystems/lacustre/pacs_prim", // PACS PRIM - "%ExportBuildDirectory%/continents/%ContinentName%/ig_land", // Instance group directory - "%ExportBuildDirectory%/continents/%ContinentName%/ig_other", // Instance group directory - "%ExportBuildDirectory%/continents/%ContinentName%/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/%ContinentName%/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/%ContinentName%/map_export", // Map directory - "%ExportBuildDirectory%/continents/%ContinentName%/map_uncompressed", // Map directory - "%ExportBuildDirectory%/continents/fyros/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/fyros/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/fyros/map_export", // Map directory - "%ExportBuildDirectory%/continents/fyros/map_uncompressed", // Map directory - "%ExportBuildDirectory%/continents/matis/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/matis/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/matis/map_export", // Map directory - "%ExportBuildDirectory%/continents/matis/map_uncompressed", // Map directory - "%ExportBuildDirectory%/continents/zorai/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/zorai/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/zorai/map_export", // Map directory - "%ExportBuildDirectory%/continents/zorai/map_uncompressed", // Map directory - "%ExportBuildDirectory%/continents/tryker/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/tryker/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/tryker/map_export", // Map directory - "%ExportBuildDirectory%/continents/tryker/map_uncompressed", // Map directory -}; - // Additional ig file name additionnal_ig = { diff --git a/workspace/continents/newbieland/directories.py b/workspace/continents/newbieland/directories.py index 229e13b..08ef309 100644 --- a/workspace/continents/newbieland/directories.py +++ b/workspace/continents/newbieland/directories.py @@ -121,6 +121,12 @@ MapLookupDirectories += [ "ecosystems/lacustre/map_uncompressed" ] # additional PacsPrimLookupDirectories = [ ] PacsPrimLookupDirectories += [ EcosystemPath + "/pacs_prim" ] +# Properties search paths +PropertiesExportBuildSearchPaths = [ ] +PropertiesExportBuildSearchPaths += IgLookupDirectories +PropertiesExportBuildSearchPaths += ShapeLookupDirectories +PropertiesExportBuildSearchPaths += MapLookupDirectories + # *** EXPORT DIRECTORIES FOR THE BUILD PIPELINE *** diff --git a/workspace/continents/newbieland/properties_base.cfg b/workspace/continents/newbieland/properties_base.cfg index fb71eb1..ec92518 100644 --- a/workspace/continents/newbieland/properties_base.cfg +++ b/workspace/continents/newbieland/properties_base.cfg @@ -15,35 +15,6 @@ level_design_dfn_directory = "%LeveldesignDfnDirectory%"; bank_name = "%ExportBuildDirectory%/%SmallbankExportDirectory%/%EcosystemName%.smallbank"; bankfar_name = "%ExportBuildDirectory%/%FarbankBuildDirectory%/%EcosystemName%.farbank"; -// Search pathes -search_pathes = -{ - "%ExportBuildDirectory%/common/sfx/ps", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_clodtex_build", // Sfx directory - "%ExportBuildDirectory%/common/sfx/shape_with_coarse_mesh", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_export", // Sfx directory - "%ExportBuildDirectory%/common/sfx/map_uncompressed", // Sfx directory - "%ExportBuildDirectory%/common/construction/shape_clodtex_build", // Construction directory - "%ExportBuildDirectory%/common/construction/shape_with_coarse_mesh", // Construction directory - "%ExportBuildDirectory%/common/construction/map_export", // Construction directory - "%ExportBuildDirectory%/common/construction/map_uncompressed", // Construction directory - "%ExportBuildDirectory%/ecosystems/%EcosystemName%/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/ecosystems/%EcosystemName%/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/ecosystems/%EcosystemName%/map_export", // Map directory - "%ExportBuildDirectory%/ecosystems/%EcosystemName%/map_uncompressed", // Map directory - "%ExportBuildDirectory%/ecosystems/lacustre/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/ecosystems/lacustre/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/ecosystems/lacustre/map_export", // Map directory - "%ExportBuildDirectory%/ecosystems/lacustre/map_uncompressed", // Map directory - "%ExportBuildDirectory%/continents/%ContinentName%/zone_light/water_shapes_lighted", // Water shape lighted directory - "%ExportBuildDirectory%/continents/%ContinentName%/ig_land", // Instance group directory - "%ExportBuildDirectory%/continents/%ContinentName%/ig_other", // Instance group directory - "%ExportBuildDirectory%/continents/%ContinentName%/shape_clodtex_build", // Shape directory - "%ExportBuildDirectory%/continents/%ContinentName%/shape_with_coarse_mesh", // Shape directory - "%ExportBuildDirectory%/continents/%ContinentName%/map_export", // Map directory - "%ExportBuildDirectory%/continents/%ContinentName%/map_uncompressed", // Map directory -}; - // Additional ig file name additionnal_ig = {