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)
Tool *tool = builder.get_toolchain().get_tool_for_suffix(*i, 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+*i);
Target *target = tool->create_source(*comp, fn);
target->set_tool(*this);
for(list<Target *>::const_iterator j=sources.begin(); j!=sources.end(); ++j)
if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(*i))
args.push_back(FS::relative(tmpl->get_path(), work_dir).str());
+ if(!out_argument.empty())
+ args.push_back(out_argument);
args.push_back(FS::relative(out_src.get_path(), work_dir).str());
return new ExternalTask(args, work_dir);
ConditionalLoader(sg.package, format("%s/%s", sg.package.get_name(), sg.tag))
{
add("argument", &Loader::argument);
+ add("arguments", &Loader::arguments);
add("command", &Loader::command);
add("in_suffix", &Loader::in_suffix);
+ add("out_argument", &SourceGenerator::out_argument);
add("out_suffix", &Loader::out_suffix);
add("processing_unit", static_cast<ProcessingUnit SourceGenerator::*>(&SourceGenerator::processing_unit));
}
obj.arguments.push_back(a);
}
+void SourceGenerator::Loader::arguments(const vector<string> &a)
+{
+ obj.arguments.insert(obj.arguments.end(), a.begin(), a.end());
+}
+
void SourceGenerator::Loader::command(const string &c)
{
- obj.set_command((obj.package.get_source_directory()/c).str());
+ if(c.find('/')!=string::npos)
+ obj.set_command((obj.package.get_source_directory()/c).str());
+ else
+ obj.set_command(c);
}
void SourceGenerator::Loader::in_suffix(const string &s)