TemplateFile &tmpl = dynamic_cast<TemplateFile &>(*sources.front());
const Component *comp = tmpl.get_component();
const SourcePackage *pkg = tmpl.get_package();
+ FS::Path subdir;
string base;
- if(processing_unit==ONE_FILE)
- base = FS::basepart(FS::basename(tmpl.get_path()));
- else if(processing_unit==DIRECTORY)
- base = FS::basename(FS::dirname(tmpl.get_path()));
- else
+ if(processing_unit==COMPONENT)
base = comp->get_name();
+ else
+ {
+ subdir = FS::dirname(FS::relative(tmpl.get_path(), pkg->get_source_directory()));
+ if(processing_unit==ONE_FILE)
+ base = FS::basepart(FS::basename(tmpl.get_path()));
+ else if(processing_unit==DIRECTORY)
+ {
+ base = FS::basename(subdir);
+ subdir = FS::dirname(subdir);
+ }
+ }
Target *primary = 0;
- for(list<string>::const_iterator i=out_suffixes.begin(); i!=out_suffixes.end(); ++i)
+ for(const string &s: out_suffixes)
{
- Tool *tool = builder.get_toolchain().get_tool_for_suffix(*i, true);
+ Tool *tool = builder.get_toolchain().get_tool_for_suffix(s, true);
if(tool)
{
- FS::Path fn = pkg->get_temp_directory()/comp->get_name()/(base+*i);
+ FS::Path fn = pkg->get_temp_directory()/"generated"/subdir/(base+s);
Target *target = tool->create_source(*comp, fn);
target->set_tool(*this);
- for(list<Target *>::const_iterator j=sources.begin(); j!=sources.end(); ++j)
- target->add_dependency(**j);
+ for(Target *t: sources)
+ target->add_dependency(*t);
if(primary)
primary->add_side_effect(*target);
else
primary = target;
}
else
- throw runtime_error("No tool found for suffix "+*i);
+ throw runtime_error("No tool found for suffix "+s);
}
return primary;
args.push_back(executable->get_path().str());
args.insert(args.end(), arguments.begin(), arguments.end());
- const Target::Dependencies &deps = target.get_dependencies();
- for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
- if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(*i))
+ for(const Target *d: target.get_dependencies())
+ if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(d))
args.push_back(FS::relative(tmpl->get_path(), work_dir).str());
if(!out_argument.empty())