Redesign how tools are run

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index b24de1396c22381ca279b9a27194f1cdc99e8541..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");
 }
 
@@ -67,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());