Redesign how tools are run

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index d23c00de00f8531898c7278d50db78730e88ddc0..1bc629ebdfe60724e4b0f5b0c10712b8821cc60e 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -16,6 +16,7 @@ DataTool::DataTool(Builder &b):
        Tool(b, "DATA")
 {
        set_command("mspdatatool");
+       set_run(_run);
        input_suffixes.push_back(".mdt");
 }
 
@@ -24,7 +25,7 @@ Target *DataTool::create_source(const Component &comp, const FS::Path &path) con
        return new DataTransform(builder, comp, path);
 }
 
-Target *DataTool::create_target(const list<Target *> &sources, const string &arg)
+Target *DataTool::create_target(const vector<Target *> &sources, const string &arg)
 {
        if(arg=="collection")
        {
@@ -39,7 +40,8 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
        {
                if(sources.empty())
                        throw invalid_argument("DataTool::create_target");
-               list<FileTarget *> files;
+               vector<FileTarget *> files;
+               files.reserve(sources.size());
                for(Target *t: sources)
                        files.push_back(&dynamic_cast<FileTarget &>(*t));
                DataPack *pack = new DataPack(builder, *files.front()->get_component(), files);
@@ -52,7 +54,9 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 
 string DataTool::create_build_signature(const BuildInfo &binfo) const
 {
-       string result;
+       string result = Tool::create_build_signature(binfo);
+       if(binfo.debug || binfo.optimize)
+               result += ',';
        if(binfo.debug)
                result += 'g';
        if(binfo.optimize>0)
@@ -64,13 +68,14 @@ string DataTool::create_build_signature(const BuildInfo &binfo) const
        return result;
 }
 
-Task *DataTool::run(const Target &tgt) const
+Task *DataTool::_run(const Target &tgt)
 {
+       const Tool &tool = *tgt.get_tool();
        const Component &comp = *tgt.get_component();
        FS::Path work_dir = comp.get_package().get_source_directory();
 
        vector<string> argv;
-       argv.push_back(executable->get_path().str());
+       argv.push_back(tool.get_executable()->get_path().str());
 
        argv.push_back("-o");
        argv.push_back(FS::relative(dynamic_cast<const FileTarget &>(tgt).get_path(), work_dir).str());