Refactor logger to do message formatting internally

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 496132f7a5266523e92777e0558aeb79b62b57cb..da7054abf3fdb5959b880e5772e55cde08863d2b 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,7 +1,9 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
+#include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "architecture.h"
 #include "builder.h"
+#include "filetarget.h"
 #include "tool.h"
 
 using namespace std;
@@ -38,17 +40,12 @@ void Tool::set_command(const string &cmd, bool cross)
 
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
-       if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
-               return true;
-       else if(aux)
-               return find(aux_suffixes.begin(), aux_suffixes.end(), suffix)!=aux_suffixes.end();
-       else
-               return false;
+       return (any_equals(input_suffixes, suffix) || (aux && any_equals(aux_suffixes, suffix)));
 }
 
 Target *Tool::create_target(Target &source, const string &arg)
 {
-       list<Target *> sources;
+       vector<Target *> sources;
        sources.push_back(&source);
        return create_target(sources, arg);
 }
@@ -65,12 +62,20 @@ void Tool::prepare()
                executable = builder.get_vfs().find_binary(command);
                if(!executable)
                {
-                       builder.get_logger().log("problems", format("Can't find executable %s for %s", command, tag));
+                       builder.get_logger().log("problems", "Can't find executable %s for %s", command, tag);
                        problems.push_back(format("Can't find executable %s", command));
                }
        }
 }
 
+string Tool::create_build_signature(const BuildInfo &) const
+{
+       if(executable)
+               return format("%s=%s", tag, FS::basename(executable->get_path()));
+       else
+               return string();
+}
+
 
 SubTool::SubTool(Tool &p):
        Tool(p),
@@ -87,7 +92,7 @@ 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)
+Target *SubTool::create_target(const vector<Target *> &s, const string &a)
 {
        return parent.create_target(s, a);
 }