Create a directory structure for generated source files

[builder.git] / source / sourcegenerator.cpp

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index 9acd69658173657db5cc02d0f86094d247be1e63..584822a1074b06a1fb959714cfbb463b63c54bbc 100644 (file)
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -22,13 +22,29 @@ Target *SourceGenerator::create_source(const Component &comp, const FS::Path &pa
 
 Target *SourceGenerator::create_target(const list<Target *> &sources, const string &)
 {
-       if(sources.size()!=1)
+       if(sources.empty())
                throw invalid_argument("SourceGenerator::create_target");
+       if(out_suffixes.empty())
+               throw logic_error("No output suffixes");
 
        TemplateFile &tmpl = dynamic_cast<TemplateFile &>(*sources.front());
        const Component *comp = tmpl.get_component();
        const SourcePackage *pkg = tmpl.get_package();
-       string base = FS::basepart(FS::basename(tmpl.get_path()));
+       FS::Path subdir;
+       string base;
+       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)
@@ -36,15 +52,18 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
                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);
-                       target->add_dependency(tmpl);
+                       for(list<Target *>::const_iterator j=sources.begin(); j!=sources.end(); ++j)
+                               target->add_dependency(**j);
                        if(primary)
                                primary->add_side_effect(*target);
                        else
                                primary = target;
                }
+               else
+                       throw runtime_error("No tool found for suffix "+*i);
        }
 
        return primary;
@@ -64,6 +83,8 @@ Task *SourceGenerator::run(const Target &target) const
                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);
@@ -75,9 +96,12 @@ SourceGenerator::Loader::Loader(SourceGenerator &sg):
        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));
 }
 
 void SourceGenerator::Loader::argument(const string &a)
@@ -85,9 +109,17 @@ void SourceGenerator::Loader::argument(const string &a)
        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)