X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=eaf4977d8c16030f2aa1bb0994ad3abc1d67c900;hb=e2c9c3fffcc61a0c102ccf6a7924e2de709092ad;hp=44255a1eb5ca692fe1fc03461cd63e4d422eca61;hpb=b45cfe5e437ca79bb3176618769628c58c0734d1;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index 44255a1..eaf4977 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,30 +1,14 @@
 #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::Tool(Builder &b, const Architecture &a, const string &t):
-	builder(b),
-	architecture(&a),
-	tag(t),
-	executable(0),
-	processing_unit(ONE_FILE),
-	prepared(false)
-{ }
-
 void Tool::set_command(const string &cmd, bool cross)
 {
 	if(cmd.empty())
@@ -36,6 +20,11 @@ void Tool::set_command(const string &cmd, bool cross)
 		command = cmd;
 }
 
+void Tool::set_run(function<Task *(const Target &)> f)
+{
+	run_func = move(f);
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
 	return (any_equals(input_suffixes, suffix) || (aux && any_equals(aux_suffixes, suffix)));
@@ -43,7 +32,7 @@ bool Tool::accepts_suffix(const string &suffix, bool aux) const
 
 Target *Tool::create_target(Target &source, const string &arg)
 {
-	list<Target *> sources;
+	vector<Target *> sources;
 	sources.push_back(&source);
 	return create_target(sources, arg);
 }
@@ -54,47 +43,34 @@ void Tool::prepare()
 		return;
 
 	prepared = true;
-	do_prepare();
-	if(!executable && !command.empty())
-	{
+
+	if(!command.empty())
 		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));
-		}
+	prepare(*this);
+	if(!command.empty() && !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));
 	}
 }
 
-
-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
+void Tool::prepare(Tool &tool) const
 {
-	return parent.create_source(p);
-}
+	if(&tool!=this && tool.get_base_tool()!=this)
+		throw invalid_argument("Tool::prepare");
 
-Target *SubTool::create_target(const list<Target *> &s, const string &a)
-{
-	return parent.create_target(s, a);
-}
+	if(&tool!=this && !command.empty() && tool.command.empty())
+		throw logic_error("Derived tool has no command");
 
-Target *SubTool::create_install(Target &t) const
-{
-	return parent.create_install(t);
+	do_prepare(tool);
 }
 
-string SubTool::create_build_signature(const BuildInfo &bi) const
+string Tool::create_build_signature(const BuildInfo &) const
 {
-	return parent.create_build_signature(bi);
+	if(executable)
+		return format("%s=%s", tag, FS::basename(executable->get_path()));
+	else
+		return string();
 }