Adjust build signatures to contain the tool tag

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index f3a29905b1651f12cc2c4dc92ef95f55e38b5a0d..377dc7f4bc0813ae095ede177bbaf004512244de 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,12 +40,7 @@ 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)
@@ -64,10 +61,21 @@ 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));
                        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),