From 5e168b210a7a1f98f6bc9eb302bb110388c37797 Mon Sep 17 00:00:00 2001
From: kaetemi <none@none>
Date: Tue, 7 Aug 2012 15:35:56 +0200
Subject: [PATCH] Added: #1440 Pipeline projects for objects bnp

--HG--
branch : build_pipeline_v3
---
 .../service/module_pipeline_master.cpp        |  6 ++++
 .../service/module_pipeline_slave.cpp         |  8 ++++-
 .../packages/objects.pipeline_package         | 33 +++++++++++++++++++
 .../common_objects_caravan.pipeline_project   | 31 +++++++++++++++++
 .../common_objects_fyros.pipeline_project     | 31 +++++++++++++++++
 .../common_objects_generique.pipeline_project | 33 +++++++++++++++++++
 .../common_objects_matis.pipeline_project     | 31 +++++++++++++++++
 .../common_objects_tryker.pipeline_project    | 31 +++++++++++++++++
 .../common_objects_zorai.pipeline_project     | 31 +++++++++++++++++
 .../pipeline/ryzom_core.pipeline_workspace    | 11 +++++--
 10 files changed, 243 insertions(+), 3 deletions(-)
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/objects.pipeline_package
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_caravan.pipeline_project
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_fyros.pipeline_project
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_generique.pipeline_project
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_matis.pipeline_project
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_tryker.pipeline_project
 create mode 100644 code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_zorai.pipeline_project

diff --git a/code/nel/tools/pipeline/service/module_pipeline_master.cpp b/code/nel/tools/pipeline/service/module_pipeline_master.cpp
index ab15d29b8..73c963a90 100644
--- a/code/nel/tools/pipeline/service/module_pipeline_master.cpp
+++ b/code/nel/tools/pipeline/service/module_pipeline_master.cpp
@@ -430,6 +430,12 @@ public:
 				}
 
 				PIPELINE::endedBuildReadyMaster();
+
+				nlinfo("#####################################");
+				nlinfo("#####################################");
+				nlinfo("! DONE !");
+				nlinfo("#####################################");
+				nlinfo("#####################################");
 			}
 		}
 	}
diff --git a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp
index 36b7af1c5..ea8db6fd0 100644
--- a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp
+++ b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp
@@ -685,7 +685,13 @@ public:
 
 		std::string filePath = unMacroPath(macroPath);
 		// m_FileStatusInitializeMutex.enter();
-		nlassert(m_ActiveProcess->m_FileStatusInputCache.find(filePath) == m_ActiveProcess->m_FileStatusInputCache.end()); // for now don't allow depending on own output within process :)
+		//nlassert(m_ActiveProcess->m_FileStatusInputCache.find(filePath) == m_ActiveProcess->m_FileStatusInputCache.end()); // for now don't allow depending on own output within process :)
+		if (m_ActiveProcess->m_FileStatusInputCache.find(filePath) != m_ActiveProcess->m_FileStatusInputCache.end())
+		{
+			nlwarning("*******************************");
+			nlwarning("Received twice the same file '%s'", filePath.c_str());
+			nlwarning("*******************************");
+		}
 		m_ActiveProcess->m_FileStatusInputCache[filePath] = fileStatus;
 		// m_FileStatusInitializeMutex.leave();
 	}
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/objects.pipeline_package b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/objects.pipeline_package
new file mode 100644
index 000000000..e7cd0ec4a
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/packages/objects.pipeline_package
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ARRAY Name="DependentProjects">
+      <ATOM Value="common_objects_generique.pipeline_project"/>
+      <ATOM Value="common_objects_fyros.pipeline_project"/>
+      <ATOM Value="common_objects_tryker.pipeline_project"/>
+      <ATOM Value="common_objects_matis.pipeline_project"/>
+      <ATOM Value="common_objects_zorai.pipeline_project"/>
+      <ATOM Value="common_objects_caravan.pipeline_project"/>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="PackageBNP"/>
+    </ARRAY>
+    <STRUCT Name="Package">
+      <STRUCT Name="BNP">
+        <ARRAY Name="SrcDirectories">
+          <ATOM Value="[@common_objects_generique:Texture.DDS[0].DstDirectory]"/>
+          <ATOM Value="[@common_objects_fyros:Texture.DDS[0].DstDirectory]"/>
+          <ATOM Value="[@common_objects_tryker:Texture.DDS[0].DstDirectory]"/>
+          <ATOM Value="[@common_objects_matis:Texture.DDS[0].DstDirectory]"/>
+          <ATOM Value="[@common_objects_zorai:Texture.DDS[0].DstDirectory]"/>
+          <ATOM Value="[@common_objects_caravan:Texture.DDS[0].DstDirectory]"/>
+        </ARRAY>
+        <ATOM Name="DstFile" Value="[$PackageDirectory]/objects.bnp"/>
+      </STRUCT>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG></FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_caravan.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_caravan.pipeline_project
new file mode 100644
index 000000000..006c0134b
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_caravan.pipeline_project
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Caravan"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="caravan"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_fyros.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_fyros.pipeline_project
new file mode 100644
index 000000000..d6a089526
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_fyros.pipeline_project
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Fyros"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="fyros"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_generique.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_generique.pipeline_project
new file mode 100644
index 000000000..476790040
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_generique.pipeline_project
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Generique"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="generique"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG>Tue Aug 07 15:06:19 2012 (kaetemi) .Macros[0].Name = Civilisation
+Tue Aug 07 15:06:19 2012 (kaetemi) .Macros[0].Value = generique
+Tue Aug 07 15:06:19 2012 (kaetemi) formName Resized = 1</LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_matis.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_matis.pipeline_project
new file mode 100644
index 000000000..1e459f21b
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_matis.pipeline_project
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Matis"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="matis"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_tryker.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_tryker.pipeline_project
new file mode 100644
index 000000000..4aaada8a7
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_tryker.pipeline_project
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Tryker"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="tryker"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_zorai.pipeline_project b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_zorai.pipeline_project
new file mode 100644
index 000000000..8ab0fbc17
--- /dev/null
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/projects/common_objects_zorai.pipeline_project
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <ATOM Name="Description" Value="Common Objects: Zorai"/>
+    <ARRAY Name="Macros">
+      <STRUCT>
+        <ATOM Name="Name" Value="Culture"/>
+        <ATOM Name="Value" Value="zorai"/>
+      </STRUCT>
+    </ARRAY>
+    <ARRAY Name="Processes">
+      <ATOM Value="TextureDDS"/>
+    </ARRAY>
+    <STRUCT Name="Texture">
+      <ARRAY Name="DDS">
+        <STRUCT>
+          <ARRAY Name="SrcDirectories">
+            <ATOM Value="[$DatabaseDirectory]/stuff/[&amp;Culture]/agents/_textures/accessories"/>
+          </ARRAY>
+          <ATOM Name="DstDirectory" Value="[!OutputDirectory]/texture_dds"/>
+          <ATOM Name="CreateMipMap" Value="true"/>
+        </STRUCT>
+      </ARRAY>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/ryzom_core.pipeline_workspace b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/ryzom_core.pipeline_workspace
index 95e1a2fb9..7f5117ee7 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/pipeline/ryzom_core.pipeline_workspace
+++ b/code/ryzom/common/data_leveldesign/leveldesign/pipeline/ryzom_core.pipeline_workspace
@@ -3,10 +3,17 @@
   <STRUCT>
     <ATOM Name="Description" Value="Ryzom Core"/>
     <ARRAY Name="Projects">
-      <ATOM Value="common_interface.pipeline_project"/>
-      <ATOM Value="interfaces.pipeline_package"/>
       <ATOM Value="gamedev.pipeline_package"/>
       <ATOM Value="data_common.pipeline_package"/>
+      <ATOM Value="common_interface.pipeline_project"/>
+      <ATOM Value="interfaces.pipeline_package"/>
+      <ATOM Value="common_objects_generique.pipeline_project"/>
+      <ATOM Value="common_objects_fyros.pipeline_project"/>
+      <ATOM Value="common_objects_tryker.pipeline_project"/>
+      <ATOM Value="common_objects_matis.pipeline_project"/>
+      <ATOM Value="common_objects_zorai.pipeline_project"/>
+      <ATOM Value="common_objects_caravan.pipeline_project"/>
+      <ATOM Value="objects.pipeline_package"/>
     </ARRAY>
     <ARRAY Name="Plugins">
       <ATOM Value="plugin_nel.pipeline_plugin"/>