X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=3aa2db3c713716ba7d90bcafa715afe368a37302;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=a2c61bf1f24ffa9cd48f4add29e0501c64f47343;hpb=3e8f3a5e852e9dd5b78ec3d89c722ef1bae6bef5;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index a2c61bf..3aa2db3 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,14 +1,39 @@
 #include <algorithm>
+#include <msp/strings/format.h>
+#include "architecture.h"
+#include "builder.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)
+	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() && !FS::Path(cmd).is_absolute())
+		command = format("%s-%s", architecture->get_cross_prefix(), cmd);
+	else
+		command = cmd;
+}
+
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
 	if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
@@ -19,13 +44,28 @@ bool Tool::accepts_suffix(const string &suffix, bool aux) const
 		return false;
 }
 
-Target *Tool::create_target(Target &source, const string &arg) const
+Target *Tool::create_target(Target &source, const string &arg)
 {
 	list<Target *> sources;
 	sources.push_back(&source);
 	return create_target(sources, arg);
 }
 
+void Tool::prepare()
+{
+	if(prepared)
+		return;
+
+	prepared = true;
+	do_prepare();
+	if(!executable && !command.empty())
+	{
+		executable = builder.get_vfs().find_binary(command);
+		if(!executable)
+			problems.push_back(format("Can't find executable %s", command));
+	}
+}
+
 
 SubTool::SubTool(Tool &p):
 	Tool(p),