Remove the now obsolete SubTool class

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 377dc7f4bc0813ae095ede177bbaf004512244de..cd002379ccc110c3cc13569563695077bea48b79 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)));
@@ -45,7 +32,7 @@ bool Tool::accepts_suffix(const string &suffix, bool aux) const
 
 Target *Tool::create_target(Target &source, const string &arg)
 {
-       list<Target *> sources;
+       vector<Target *> sources;
        sources.push_back(&source);
        return create_target(sources, arg);
 }
@@ -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(!command.empty() && !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,37 +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);
-}
-
-Target *SubTool::create_source(const FS::Path &p) const
-{
-       return parent.create_source(p);
-}
-
-Target *SubTool::create_target(const list<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();