Fix logic issues with Tool::prepare

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 402d20d0b8722ae09d09e15af9eec27955180cae..82349e18eea50b747d8870ffb3f3113980dc7216 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -43,18 +43,25 @@ void Tool::prepare()
                return;
 
        prepared = true;
-       do_prepare();
-       if(!executable && !command.empty())
-       {
+
+       if(!command.empty())
                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));
-               }
+       prepare(*this);
+       if(!command.empty() && !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));
        }
 }
 
+void Tool::prepare(Tool &tool) const
+{
+       if(&tool!=this && tool.get_base_tool()!=this)
+               throw invalid_argument("Tool::prepare");
+
+       do_prepare(tool);
+}
+
 string Tool::create_build_signature(const BuildInfo &) const
 {
        if(executable)
@@ -64,32 +71,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();