Delay locating tool executables until the tool is needed

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index a956984a35deb6e9aa8b19eeca274fab4513db37..4a4fc8a0cd89360d875bc7682de8c8b02afc6cd5 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -16,10 +16,6 @@ using namespace Msp;
 DataTool::DataTool(Builder &b):
        Tool(b, "DATA")
 {
-       executable = builder.get_vfs().find_binary("mspdatatool");
-       if(!executable)
-               builder.problem(string(), format("Can't find executable mspdatatool for tool %s", tag));
-
        input_suffixes.push_back(".mdt");
 }
 
@@ -28,7 +24,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) const
+Target *DataTool::create_target(const list<Target *> &sources, const string &arg)
 {
        if(arg=="collection")
        {
@@ -52,6 +48,13 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
                throw invalid_argument("DataTool::create_target");
 }
 
+void DataTool::do_prepare()
+{
+       executable = builder.get_vfs().find_binary("mspdatatool");
+       if(!executable)
+               builder.problem(string(), format("Can't find executable mspdatatool for tool %s", tag));
+}
+
 Task *DataTool::run(const Target &tgt) const
 {
        const Component &comp = *tgt.get_component();