Add logging for some problem situations

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index a23de6322e8ad3fef1422531d8577944b18000de..496132f7a5266523e92777e0558aeb79b62b57cb 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,13 +1,18 @@
 #include <algorithm>
+#include <msp/strings/format.h>
+#include "architecture.h"
+#include "builder.h"
 #include "tool.h"
 
 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)
 { }
 
@@ -16,9 +21,21 @@ Tool::Tool(Builder &b, const Architecture &a, const string &t):
        architecture(&a),
        tag(t),
        executable(0),
+       processing_unit(ONE_FILE),
        prepared(false)
 { }
 
+void Tool::set_command(const string &cmd, bool cross)
+{
+       if(cmd.empty())
+               throw invalid_argument("Tool::set_command");
+
+       if(cross && architecture->is_cross() && !FS::Path(cmd).is_absolute())
+               command = format("%s-%s", architecture->get_cross_prefix(), cmd);
+       else
+               command = cmd;
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
        if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
@@ -43,6 +60,15 @@ void Tool::prepare()
 
        prepared = true;
        do_prepare();
+       if(!executable && !command.empty())
+       {
+               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));
+               }
+       }
 }
 
 
@@ -50,3 +76,42 @@ 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();
+       if(str=="FILE")
+               unit = Tool::ONE_FILE;
+       else if(str=="DIRECTORY")
+               unit = Tool::DIRECTORY;
+       else if(str=="COMPONENT")
+               unit = Tool::COMPONENT;
+       else
+               throw lexical_error(format("conversion of '%s' to ProcessingUnit", str));
+}