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 @@ + +
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 @@ + + 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 @@ + + 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 @@ + + 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 @@ + + 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 @@ + + 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 @@ + + 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 @@