Remove the now obsolete SubTool class

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 852fa2d5805b294b4d74b5a5ab165039b08feaad..cd002379ccc110c3cc13569563695077bea48b79 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -20,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)));
@@ -38,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(!command.empty() && !executable)
        {
-               executable = builder.get_vfs().find_binary(command);
-               if(!executable)
-               {
-                       builder.get_logger().log("problems", "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));
        }
 }
 
@@ -59,32 +62,6 @@ string Tool::create_build_signature(const BuildInfo &) const
 }
 
 
-Target *SubTool::create_source(const Component &c, const FS::Path &p) const
-{
-       return parent.create_source(c, p);
-}
-
-Target *SubTool::create_source(const FS::Path &p) const
-{
-       return parent.create_source(p);
-}
-
-Target *SubTool::create_target(const vector<Target *> &s, const string &a)
-{
-       return parent.create_target(s, a);
-}
-
-Target *SubTool::create_install(Target &t) const
-{
-       return parent.create_install(t);
-}
-
-string SubTool::create_build_signature(const BuildInfo &bi) const
-{
-       return parent.create_build_signature(bi);
-}
-
-
 void operator>>(const LexicalConverter &conv, Tool::ProcessingUnit &unit)
 {
        const string &str = conv.get();