X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcegenerator.cpp;h=584822a1074b06a1fb959714cfbb463b63c54bbc;hb=a557d2ba9aae4a05e4b15c81ba5262da7caac2a5;hp=6394bd715861466eef2f6fc78640d795c35e31d2;hpb=8543062496cb35d73014d0a9877cbe5553aa30a4;p=builder.git

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index 6394bd7..584822a 100644
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -30,13 +30,21 @@ 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();
+	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)
@@ -44,7 +52,7 @@ 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);
 			for(list<Target *>::const_iterator j=sources.begin(); j!=sources.end(); ++j)
@@ -75,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);
@@ -86,8 +96,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,6 +109,11 @@ 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)
 {
 	if(c.find('/')!=string::npos)