File Tool's executable before calling do_prepare

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 54138215e5f0ca25d368fb32bc801592f3413c2d..6e2b21431fc5d1808fef9fd691ccd83ff1bd3275 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -9,24 +9,6 @@
 using namespace std;
 using namespace Msp;
 
-Tool::Tool(Builder &b, const string &t):
-       builder(b),
-       architecture(0),
-       tag(t),
-       executable(0),
-       processing_unit(ONE_FILE),
-       prepared(false)
-{ }
-
-Tool::Tool(Builder &b, const Architecture &a, const string &t):
-       builder(b),
-       architecture(&a),
-       tag(t),
-       executable(0),
-       processing_unit(ONE_FILE),
-       prepared(false)
-{ }
-
 void Tool::set_command(const string &cmd, bool cross)
 {
        if(cmd.empty())
@@ -38,6 +20,11 @@ void Tool::set_command(const string &cmd, bool cross)
                command = cmd;
 }
 
+void Tool::set_run(function<Task *(const Target &)> f)
+{
+       run_func = move(f);
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
        return (any_equals(input_suffixes, suffix) || (aux && any_equals(aux_suffixes, suffix)));
@@ -56,15 +43,13 @@ void Tool::prepare()
                return;
 
        prepared = true;
+       if(!command.empty())
+               executable = builder.get_vfs().find_binary(command);
        do_prepare();
-       if(!executable && !command.empty())
+       if(!executable)
        {
-               executable = builder.get_vfs().find_binary(command);
-               if(!executable)
-               {
-                       builder.get_logger().log("problems", format("Can't find executable %s for %s", command, tag));
-                       problems.push_back(format("Can't find executable %s", command));
-               }
+               builder.get_logger().log("problems", "Can't find executable %s for %s", command, tag);
+               problems.push_back(format("Can't find executable %s", command));
        }
 }
 
@@ -77,11 +62,6 @@ string Tool::create_build_signature(const BuildInfo &) const
 }
 
 
-SubTool::SubTool(Tool &p):
-       Tool(p),
-       parent(p)
-{ }
-
 Target *SubTool::create_source(const Component &c, const FS::Path &p) const
 {
        return parent.create_source(c, p);