X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcegenerator.cpp;h=76d6c892a20942647316b8c2eb8ac83629c215f0;hb=9053d11310842cb9b8a0f13fe1d86b60cae5231c;hp=c09e5c7d9527c3b60f17ce2bcef6069fac239144;hpb=6140518acb736f9020005245686bfbc5fca2d329;p=builder.git

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index c09e5c7..76d6c89 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"
@@ -49,14 +50,6 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
 	return primary;
 }
 
-void SourceGenerator::do_prepare()
-{
-	FS::Path exe_fn = package.get_source_directory()/command;
-	executable = builder.get_vfs().get_target(exe_fn);
-	if(!executable)
-		executable = new Executable(builder, exe_fn);
-}
-
 Task *SourceGenerator::run(const Target &target) const
 {
 	const SourceFile &out_src = dynamic_cast<const SourceFile &>(target);
@@ -77,7 +70,8 @@ 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("command",    &Loader::command);
 	add("in_suffix",  &Loader::in_suffix);
@@ -86,7 +80,7 @@ SourceGenerator::Loader::Loader(SourceGenerator &sg):
 
 void SourceGenerator::Loader::command(const string &c)
 {
-	obj.set_command(c);
+	obj.set_command((obj.package.get_source_directory()/c).str());
 }
 
 void SourceGenerator::Loader::in_suffix(const string &s)