Refactor the use of external tasks in tools

[builder.git] / source / sourcegenerator.cpp

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index f4b43a82c8c32e7ffa016f9a57f00004174f5875..d30a2bc67fdefa3687e6c18193b0c9eaae504c7c 100644 (file)
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/format.h>
 #include "builder.h"
 #include "executable.h"
-#include "externaltask.h"
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
 #include "templatefile.h"
@@ -13,14 +12,16 @@ using namespace Msp;
 SourceGenerator::SourceGenerator(Builder &b, const SourcePackage &p, const string &t):
        Tool(b, t),
        package(p)
-{ }
+{
+       set_run_external(&_run);
+}
 
 Target *SourceGenerator::create_source(const Component &comp, const FS::Path &path) const
 {
        return new TemplateFile(builder, comp, path);
 }
 
-Target *SourceGenerator::create_target(const list<Target *> &sources, const string &)
+Target *SourceGenerator::create_target(const vector<Target *> &sources, const string &)
 {
        if(sources.empty())
                throw invalid_argument("SourceGenerator::create_target");
@@ -69,24 +70,23 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
        return primary;
 }
 
-Task *SourceGenerator::run(const Target &target) const
+ExternalTask::Arguments SourceGenerator::_run(const SourceFile &out_src, FS::Path &work_dir)
 {
-       const SourceFile &out_src = dynamic_cast<const SourceFile &>(target);
-       const FS::Path &work_dir = out_src.get_package()->get_source_directory();
+       const SourceGenerator &tool = dynamic_cast<const SourceGenerator &>(*out_src.get_tool());
 
        vector<string> args;
-       args.push_back(executable->get_path().str());
-       args.insert(args.end(), arguments.begin(), arguments.end());
+       args.push_back(tool.get_executable()->get_path().str());
+       args.insert(args.end(), tool.arguments.begin(), tool.arguments.end());
 
-       for(const Target *d: target.get_dependencies())
+       for(const Target *d: out_src.get_dependencies())
                if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(d))
                        args.push_back(FS::relative(tmpl->get_path(), work_dir).str());
 
-       if(!out_argument.empty())
-               args.push_back(out_argument);
+       if(!tool.out_argument.empty())
+               args.push_back(tool.out_argument);
        args.push_back(FS::relative(out_src.get_path(), work_dir).str());
 
-       return new ExternalTask(args, work_dir);
+       return args;
 }