X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=82349e18eea50b747d8870ffb3f3113980dc7216;hb=15cf75a5ac62454d90b8b2987b1940710056f4d0;hp=da7054abf3fdb5959b880e5772e55cde08863d2b;hpb=5e00719d0c63e306786ff36df61797cdbc86f3e9;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index da7054a..82349e1 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -9,24 +9,6 @@
 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())
@@ -38,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)));
@@ -56,18 +43,25 @@ 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", "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));
 	}
 }
 
+void Tool::prepare(Tool &tool) const
+{
+	if(&tool!=this && tool.get_base_tool()!=this)
+		throw invalid_argument("Tool::prepare");
+
+	do_prepare(tool);
+}
+
 string Tool::create_build_signature(const BuildInfo &) const
 {
 	if(executable)
@@ -77,37 +71,6 @@ string Tool::create_build_signature(const BuildInfo &) const
 }
 
 
-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();