X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=852fa2d5805b294b4d74b5a5ab165039b08feaad;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=abded33f7aba8131d1f64d8b6c050a3da1e7d504;hpb=e516e78510ad455eebc0e06645c9f12943117525;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index abded33..852fa2d 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,34 +1,20 @@
-#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),
-	prepared(false)
-{ }
-
-Tool::Tool(Builder &b, const Architecture &a, const string &t):
-	builder(b),
-	architecture(&a),
-	tag(t),
-	executable(0),
-	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())
+	if(cross && architecture->is_cross() && !FS::Path(cmd).is_absolute())
 		command = format("%s-%s", architecture->get_cross_prefix(), cmd);
 	else
 		command = cmd;
@@ -36,17 +22,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);
 }
@@ -62,12 +43,57 @@ 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),
-	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 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();
+	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));
+}