X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcegenerator.cpp;h=f00b26bc8a5dc06bf1dddf2d0e79ac89ed171389;hb=5033a9de732963dfcadc42ad381df00b69cf624d;hp=4f757217958a7acf8eb9a3a981a985d579e60ac3;hpb=276a7c7c046a8f1b692cecbd53f17595ed23264d;p=builder.git

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index 4f75721..f00b26b 100644
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "executable.h"
 #include "externaltask.h"
@@ -23,6 +24,8 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
 {
 	if(sources.size()!=1)
 		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();
@@ -44,6 +47,8 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
 			else
 				primary = target;
 		}
+		else
+			throw runtime_error("No tool found for suffix "+*i);
 	}
 
 	return primary;
@@ -56,6 +61,7 @@ Task *SourceGenerator::run(const Target &target) const
 
 	vector<string> args;
 	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)
@@ -69,13 +75,20 @@ Task *SourceGenerator::run(const Target &target) const
 
 
 SourceGenerator::Loader::Loader(SourceGenerator &sg):
-	DataFile::ObjectLoader<SourceGenerator>(sg)
+	DataFile::ObjectLoader<SourceGenerator>(sg),
+	ConditionalLoader(sg.package, format("%s/%s", sg.package.get_name(), sg.tag))
 {
+	add("argument",   &Loader::argument);
 	add("command",    &Loader::command);
 	add("in_suffix",  &Loader::in_suffix);
 	add("out_suffix", &Loader::out_suffix);
 }
 
+void SourceGenerator::Loader::argument(const string &a)
+{
+	obj.arguments.push_back(a);
+}
+
 void SourceGenerator::Loader::command(const string &c)
 {
 	obj.set_command((obj.package.get_source_directory()/c).str());