Changed: #1440 Forgot something

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent cfd3e9b7a1
commit 41c85b16d3

@ -248,6 +248,8 @@ void CPipelineProcessImpl::parseToolLog(const std::string &dependLogFile, const
if (wildcard_it != metaDepends.end()) if (wildcard_it != metaDepends.end())
{ {
for (std::map<std::string, CFileDepend>::iterator it = metaDepends.begin(), end = metaDepends.end(); it != end; ++it) for (std::map<std::string, CFileDepend>::iterator it = metaDepends.begin(), end = metaDepends.end(); it != end; ++it)
{
if (it->first != "*")
{ {
for (std::vector<CFileDepend::CDependency>::iterator sub_it = wildcard_it->second.Dependencies.begin(), sub_end = wildcard_it->second.Dependencies.end(); sub_it != sub_end; ++sub_it) for (std::vector<CFileDepend::CDependency>::iterator sub_it = wildcard_it->second.Dependencies.begin(), sub_end = wildcard_it->second.Dependencies.end(); sub_it != sub_end; ++sub_it)
it->second.Dependencies.push_back(*sub_it); it->second.Dependencies.push_back(*sub_it);
@ -257,6 +259,8 @@ void CPipelineProcessImpl::parseToolLog(const std::string &dependLogFile, const
it->second.RuntimeDependencies.push_back(*sub_it); it->second.RuntimeDependencies.push_back(*sub_it);
} }
} }
metaDepends.erase(wildcard_it);
}
// Write depend meta files // Write depend meta files
for (std::map<std::string, CFileDepend>::iterator it = metaDepends.begin(), end = metaDepends.end(); it != end; ++it) for (std::map<std::string, CFileDepend>::iterator it = metaDepends.begin(), end = metaDepends.end(); it != end; ++it)

Loading…
Cancel
Save