Support source generators that combine multiple files into one

[builder.git] / source / sourcegenerator.cpp

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index f00b26bc8a5dc06bf1dddf2d0e79ac89ed171389..192ae289584b186461bd1442cbe1ce800391c7af 100644 (file)
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -22,7 +22,7 @@ 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");
@@ -30,7 +30,13 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
        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()));
+       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
+               base = comp->get_name();
 
        Target *primary = 0;
        for(list<string>::const_iterator i=out_suffixes.begin(); i!=out_suffixes.end(); ++i)
@@ -41,7 +47,8 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
                        FS::Path fn = pkg->get_temp_directory()/comp->get_name()/(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
@@ -82,6 +89,7 @@ SourceGenerator::Loader::Loader(SourceGenerator &sg):
        add("command",    &Loader::command);
        add("in_suffix",  &Loader::in_suffix);
        add("out_suffix", &Loader::out_suffix);
+       add("processing_unit", static_cast<ProcessingUnit SourceGenerator::*>(&SourceGenerator::processing_unit));
 }
 
 void SourceGenerator::Loader::argument(const string &a)