X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcegenerator.cpp;h=5123f09d0d0aad9b3e6603fd320b4b7ed92b3bf9;hb=f622661da16d5724a778f87c5be46fe9be8a6412;hp=192ae289584b186461bd1442cbe1ce800391c7af;hpb=4e2a160d94ca808cfb511cc2d38e115d989809f2;p=builder.git

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index 192ae28..5123f09 100644
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -75,6 +75,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);
@@ -86,8 +88,10 @@ 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));
 }
@@ -97,9 +101,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)