X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatapackcomponent.cpp;h=5750287fefe39a3b024f6cbf8630fa271faf8db6;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=0b8d020eead41c9c0adc50056f60acca3fff6a47;hpb=a17effb99d06b534bd3ed8e2723dc7da389bf8fc;p=builder.git diff --git a/source/datapackcomponent.cpp b/source/datapackcomponent.cpp index 0b8d020..5750287 100644 --- a/source/datapackcomponent.cpp +++ b/source/datapackcomponent.cpp @@ -17,20 +17,19 @@ void DataPackComponent::create_targets() const Builder &builder = package.get_builder(); Tool &dcomp = builder.get_toolchain().get_tool("DATA"); - list files; - SourceList source_filenames = collect_source_files(); - for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + vector files; + for(const FS::Path &s: collect_source_files()) { - string ext = FS::extpart(FS::basename(*i)); + string ext = FS::extpart(FS::basename(s)); if(ext==".mdt") { - Target *src = dcomp.create_source(*this, *i); + Target *src = dcomp.create_source(*this, s); files.push_back(dcomp.create_target(*src, "collection")); } - else if(Target *tgt = builder.get_vfs().get_target(*i)) + else if(Target *tgt = builder.get_vfs().get_target(s)) files.push_back(tgt); else - files.push_back(new DataSourceFile(builder, *this, *i)); + files.push_back(new DataSourceFile(builder, *this, s)); } Target *result = dcomp.create_target(files, "pack");