X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=5d0903a2e3c4eb44902ccd9d178c5aa207655e6a;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=f3a29905b1651f12cc2c4dc92ef95f55e38b5a0d;hpb=82f1175238a94618b0cf1485b0132fb965996843;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index f3a2990..5d0903a 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,28 +1,26 @@
-#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;
 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(b, 0, t)
 { }
 
 Tool::Tool(Builder &b, const Architecture &a, const string &t):
+	Tool(b, &a, t)
+{ }
+
+Tool::Tool(Builder &b, const Architecture *a, const string &t):
 	builder(b),
-	architecture(&a),
-	tag(t),
-	executable(0),
-	processing_unit(ONE_FILE),
-	prepared(false)
+	architecture(a),
+	tag(t)
 { }
 
 void Tool::set_command(const string &cmd, bool cross)
@@ -38,17 +36,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);
 }
@@ -64,10 +57,21 @@ void Tool::prepare()
 	{
 		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));
+		}
 	}
 }
 
+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),
@@ -84,7 +88,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);
 }