From c807a1eab51bece568080e640a4f1493cecc75d8 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 4 Aug 2012 14:18:23 +0200 Subject: [PATCH] Changed: #1440 Some cleanup --HG-- branch : build_pipeline_v3 --- code/nel/tools/pipeline/service/pipeline_process_impl.h | 4 +--- .../pipeline/service/pipeline_process_impl_toollog.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/tools/pipeline/service/pipeline_process_impl.h b/code/nel/tools/pipeline/service/pipeline_process_impl.h index fa7eae072..31c7671fe 100644 --- a/code/nel/tools/pipeline/service/pipeline_process_impl.h +++ b/code/nel/tools/pipeline/service/pipeline_process_impl.h @@ -102,9 +102,7 @@ private: std::set m_ListInputRemoved; std::set m_ListOutputChanged; - std::set m_ListOutputChangedNG; // after .depend check, found that dependencies changed, so not good - std::set m_ListOutputChangedOK; // idem but dependencies did not change, so ok - std::set m_ListOutputRemoved; // changed_ng and removed end up being the same, it needs to be rebuilt ;) + std::set m_ListOutputRemoved; std::set m_ListDependentDirectories; std::set m_ListDependentFiles; diff --git a/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp b/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp index bfee76067..5d83d2b60 100644 --- a/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp +++ b/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp @@ -165,7 +165,7 @@ void CPipelineProcessImpl::parseToolLog(const std::string &dependLogFile, const return; } std::string outputFile = standardizePath(tabbedLine[1], false); - std::string outputFileMacro = macroPath(outputFile); + // std::string outputFileMacro = macroPath(outputFile); std::string inputFile = standardizePath(tabbedLine[2], false); std::string inputFileMacro = macroPath(inputFile); std::map::iterator metaDependIt = metaDepends.find(outputFile); @@ -179,11 +179,13 @@ void CPipelineProcessImpl::parseToolLog(const std::string &dependLogFile, const metaDependIt->second.CRC32 = status.CRC32; // nldebug("Checksum %i; %i", metaDependIt->second.CRC32, status.CRC32); - m_ResultCurrent.MacroPaths.push_back(outputFileMacro); + /*m_ResultCurrent.MacroPaths.push_back(outputFileMacro); CProcessResult::CFileResult prfr; prfr.Level = STATE_SUCCESS; // dunno if still needed? prfr.CRC32 = status.CRC32; - m_ResultCurrent.FileResults.push_back(prfr); + m_ResultCurrent.FileResults.push_back(prfr);*/ + + m_FileStatusOutputCache[outputFile] = status; } CFileDepend::CDependency dependency; dependency.MacroPath = inputFileMacro;