From aa39b753a88f59d1889dcdb6aaedcb5c647a3be3 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@localhost>
Date: Wed, 28 Sep 2011 09:49:16 +0200
Subject: [PATCH] Changed: #1093 Build pacs prim list to correct location.

---
 .../generators/max_exporter_scripts/pacs_prim.py    | 11 +----------
 .../build_gamedata/processes/pacs_prim/1_export.py  | 13 ++-----------
 .../tools/build_gamedata/processes/skel/1_export.py |  2 +-
 .../tools/build_gamedata/processes/swt/1_export.py  |  2 +-
 .../tools/build_gamedata/processes/zone/1_export.py |  2 +-
 .../workspace/common/data_common/directories.py     | 12 +++++++++++-
 .../workspace/common/data_common/process.py         |  4 ++++
 7 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
index b1c3e5966..2e3f07ec9 100644
--- a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
+++ b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py
@@ -1,16 +1,7 @@
 
 
-printLog(log, ">>> List %PreGenFileExtension% <<<")
-outDirPacsPrim =  ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable%
-mkPath(log, outDirPacsPrim)
+# Remove bad file from previous script version
 listPath = ExportBuildDirectory + "/" + %PreGenExportDirectoryVariable% + "/landscape_col_prim_pacs_list.txt"
 if os.path.isfile(listPath):
 	os.remove(listPath)
-if WantLandscapeColPrimPacsList:
-	exportedPacsPrims = findFiles(log, outDirPacsPrim, "", ".%PreGenFileExtension%")
-	printLog(log, "WRITE " + listPath)
-	listFile = open(listPath, "w")
-	for exported in exportedPacsPrims:
-		listFile.write(exported + "\n")
-	listFile.close()
 
diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py b/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
index 5779a8cd7..e21fb4fde 100644
--- a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export pacs_prim
-# \date 2010-09-19-14-19-GMT
+# \date 2011-09-28-07-42-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export pacs_prim
@@ -92,19 +92,10 @@ if MaxAvailable:
 
 
 
-printLog(log, ">>> List pacs_prim <<<")
-outDirPacsPrim =  ExportBuildDirectory + "/" + PacsPrimExportDirectory
-mkPath(log, outDirPacsPrim)
+# Remove bad file from previous script version
 listPath = ExportBuildDirectory + "/" + PacsPrimExportDirectory + "/landscape_col_prim_pacs_list.txt"
 if os.path.isfile(listPath):
 	os.remove(listPath)
-if WantLandscapeColPrimPacsList:
-	exportedPacsPrims = findFiles(log, outDirPacsPrim, "", ".pacs_prim")
-	printLog(log, "WRITE " + listPath)
-	listFile = open(listPath, "w")
-	for exported in exportedPacsPrims:
-		listFile.write(exported + "\n")
-	listFile.close()
 
 
 
diff --git a/code/nel/tools/build_gamedata/processes/skel/1_export.py b/code/nel/tools/build_gamedata/processes/skel/1_export.py
index af73024c5..84e9ce931 100644
--- a/code/nel/tools/build_gamedata/processes/skel/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/skel/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export skel
-# \date 2010-09-19-14-19-GMT
+# \date 2011-09-28-07-42-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export skel
diff --git a/code/nel/tools/build_gamedata/processes/swt/1_export.py b/code/nel/tools/build_gamedata/processes/swt/1_export.py
index 3b8da1d0f..6ad3c8f13 100644
--- a/code/nel/tools/build_gamedata/processes/swt/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/swt/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export swt
-# \date 2010-09-19-14-19-GMT
+# \date 2011-09-28-07-42-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export swt
diff --git a/code/nel/tools/build_gamedata/processes/zone/1_export.py b/code/nel/tools/build_gamedata/processes/zone/1_export.py
index 8b34753c9..d464e3f31 100644
--- a/code/nel/tools/build_gamedata/processes/zone/1_export.py
+++ b/code/nel/tools/build_gamedata/processes/zone/1_export.py
@@ -6,7 +6,7 @@
 # 
 # \file 1_export.py
 # \brief Export zone
-# \date 2010-09-19-14-19-GMT
+# \date 2011-09-28-07-42-GMT
 # \author Jan Boon (Kaetemi)
 # Python port of game data build pipeline.
 # Export zone
diff --git a/code/ryzom/tools/build_gamedata/workspace/common/data_common/directories.py b/code/ryzom/tools/build_gamedata/workspace/common/data_common/directories.py
index 4cf2384e9..c2399a190 100644
--- a/code/ryzom/tools/build_gamedata/workspace/common/data_common/directories.py
+++ b/code/ryzom/tools/build_gamedata/workspace/common/data_common/directories.py
@@ -57,7 +57,17 @@ CopyDatabaseSourceDirectories = [ ]
 CopyDatabaseSourceFiles = [ ]
 
 
+# *** SOURCE DIRECTORIES IN THE EXPORT/BUILD ***
+
+# Pacs prim list source directories
+PacsPrimExportSourceDirectories = [ ]
+PacsPrimExportSourceDirectories += [ "ecosystems/desert/pacs_prim" ]
+PacsPrimExportSourceDirectories += [ "ecosystems/jungle/pacs_prim" ]
+PacsPrimExportSourceDirectories += [ "ecosystems/lacustre/pacs_prim" ]
+PacsPrimExportSourceDirectories += [ "ecosystems/primes_racines/pacs_prim" ]
+
+
 # *** INSTALL DIRECTORIES IN THE CLIENT DATA ***
 
-# Particule system directory
+# Common data install directory
 CopyInstallDirectory = CommonName
diff --git a/code/ryzom/tools/build_gamedata/workspace/common/data_common/process.py b/code/ryzom/tools/build_gamedata/workspace/common/data_common/process.py
index f868e1f94..d00d44e8a 100644
--- a/code/ryzom/tools/build_gamedata/workspace/common/data_common/process.py
+++ b/code/ryzom/tools/build_gamedata/workspace/common/data_common/process.py
@@ -28,6 +28,7 @@
 
 # *** PROCESS CONFIG ***
 ProcessToComplete = [ ]
+ProcessToComplete += [ "pacs_prim_list" ]
 ProcessToComplete += [ "copy" ]
 
 
@@ -36,6 +37,9 @@ CommonName = "data_common"
 CommonPath = "common/" + CommonName
 
 
+# *** PACS PRIM LIST OPTIONS ***
+
+
 # *** COPY DIR OPTIONS ***