Redesign how tools are run

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index eeeec4ea68b30706a670c6b84ffd0af98d64cfdf..1bc629ebdfe60724e4b0f5b0c10712b8821cc60e 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -15,6 +15,8 @@ using namespace Msp;
 DataTool::DataTool(Builder &b):
        Tool(b, "DATA")
 {
+       set_command("mspdatatool");
+       set_run(_run);
        input_suffixes.push_back(".mdt");
 }
 
@@ -23,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")
        {
@@ -36,9 +38,12 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
        }
        else if(arg=="pack")
        {
-               list<FileTarget *> files;
-               for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-                       files.push_back(&dynamic_cast<FileTarget &>(**i));
+               if(sources.empty())
+                       throw invalid_argument("DataTool::create_target");
+               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);
                pack->set_tool(*this);
                return pack;
@@ -47,23 +52,36 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
                throw invalid_argument("DataTool::create_target");
 }
 
-void DataTool::do_prepare()
+string DataTool::create_build_signature(const BuildInfo &binfo) const
 {
-       set_executable("mspdatatool");
+       string result = Tool::create_build_signature(binfo);
+       if(binfo.debug || binfo.optimize)
+               result += ',';
+       if(binfo.debug)
+               result += 'g';
+       if(binfo.optimize>0)
+       {
+               result += 'b';
+               if(binfo.optimize>1)
+                       result += 'z';
+       }
+       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());
 
-       const BuildInfo &binfo = comp.get_build_info();
+       BuildInfo binfo;
+       tgt.collect_build_info(binfo);
        if(binfo.debug)
                argv.push_back("-g");
        if(binfo.optimize>0)
@@ -81,9 +99,8 @@ Task *DataTool::run(const Target &tgt) const
        else if(const DataPack *pack = dynamic_cast<const DataPack *>(&tgt))
        {
                argv.push_back("-p");
-               const DataPack::FileList &files = pack->get_files();
-               for(DataPack::FileList::const_iterator i=files.begin(); i!=files.end(); ++i)
-                       argv.push_back(FS::relative((*i)->get_path(), work_dir).str());
+               for(const FileTarget *f: pack->get_files())
+                       argv.push_back(FS::relative(f->get_path(), work_dir).str());
        }
 
        return new ExternalTask(argv, work_dir);