Changed: #1440 Some cleanup

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent 8f389a0957
commit c807a1eab5

@ -102,9 +102,7 @@ private:
std::set<std::string> m_ListInputRemoved;
std::set<std::string> m_ListOutputChanged;
std::set<std::string> m_ListOutputChangedNG; // after .depend check, found that dependencies changed, so not good
std::set<std::string> m_ListOutputChangedOK; // idem but dependencies did not change, so ok
std::set<std::string> m_ListOutputRemoved; // changed_ng and removed end up being the same, it needs to be rebuilt ;)
std::set<std::string> m_ListOutputRemoved;
std::set<std::string> m_ListDependentDirectories;
std::set<std::string> m_ListDependentFiles;

@ -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<std::string, CFileDepend>::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;

Loading…
Cancel
Save