From cce3439b8b7334da7a21e56720d29aeadcc0c816 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 3 Aug 2012 17:22:16 +0200 Subject: [PATCH] Added: #1440 Entry for runtime dependencies in the depend file --HG-- branch : build_pipeline_v3 --- code/nel/tools/pipeline/service/metadata_storage.cpp | 1 + code/nel/tools/pipeline/service/metadata_storage.h | 1 + code/nel/tools/pipeline/service/module_pipeline_slave.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/pipeline/service/metadata_storage.cpp b/code/nel/tools/pipeline/service/metadata_storage.cpp index a1a61eae0..31260a509 100644 --- a/code/nel/tools/pipeline/service/metadata_storage.cpp +++ b/code/nel/tools/pipeline/service/metadata_storage.cpp @@ -83,6 +83,7 @@ void CFileDepend::serial(NLMISC::IStream &stream) throw (NLMISC::EStream) uint version = stream.serialVersion(1); stream.serial(CRC32); stream.serialCont(Dependencies); + stream.serialCont(RuntimeDependencies); } void CProcessResult::CFileResult::serial(NLMISC::IStream &stream) throw (NLMISC::EStream) diff --git a/code/nel/tools/pipeline/service/metadata_storage.h b/code/nel/tools/pipeline/service/metadata_storage.h index afd0718a3..e9fed90f2 100644 --- a/code/nel/tools/pipeline/service/metadata_storage.h +++ b/code/nel/tools/pipeline/service/metadata_storage.h @@ -113,6 +113,7 @@ public: void serial(NLMISC::IStream &stream) throw (NLMISC::EStream); }; std::vector Dependencies; + std::vector RuntimeDependencies; // informational void serial(NLMISC::IStream &stream) throw (NLMISC::EStream); }; diff --git a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp index 138d88fb2..23dfa0af8 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp @@ -922,7 +922,7 @@ public: if (!CDatabaseStatus::updateFileStatus(metaStatus, path)) { m_SubTaskResult = FINISH_ERROR; - m_SubTaskErrorMessage = std::string("Could not get status for output file '") + path + "'"; + m_SubTaskErrorMessage = std::string("Could not get status for output file ', this should never happen at all, coding error") + path + "'"; return false; // Error, cannot rebuild. } else @@ -938,7 +938,7 @@ public: if (inputModified) { // Compare the input checksums with the cached input checksums - + } } }