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

diff --git a/source/tool.cpp b/source/tool.cpp
index a23de63..5d0903a 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,37 +1,47 @@
-#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(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),
-	prepared(false)
+	architecture(a),
+	tag(t)
 { }
 
-bool Tool::accepts_suffix(const string &suffix, bool aux) const
+void Tool::set_command(const string &cmd, bool cross)
 {
-	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();
+	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
-		return false;
+		command = cmd;
+}
+
+bool Tool::accepts_suffix(const string &suffix, bool aux) const
+{
+	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);
 }
@@ -43,6 +53,23 @@ 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", "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();
 }
 
 
@@ -50,3 +77,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 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));
+}