X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.h;h=ad89e47431b3b47eee53c8d7a747ef98cce2707c;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=042199e54b79342c10e967f7b6de00a6e474554c;hpb=0d95fee118a3fcd78f153dca5721d9fe19b6f6bf;p=builder.git

diff --git a/source/tool.h b/source/tool.h
index 042199e..ad89e47 100644
--- a/source/tool.h
+++ b/source/tool.h
@@ -4,6 +4,7 @@
 #include <list>
 #include <string>
 #include <msp/fs/path.h>
+#include "buildinfo.h"
 
 class Architecture;
 class Builder;
@@ -27,10 +28,12 @@ protected:
 	Builder &builder;
 	const Architecture *architecture;
 	std::string tag;
+	std::string command;
 	FileTarget *executable;
 	SuffixList input_suffixes;
 	SuffixList aux_suffixes;
 	SearchPath system_path;
+	BuildInfo build_info;
 	bool prepared;
 	std::list<std::string> problems;
 
@@ -41,8 +44,19 @@ public:
 
 	const std::string &get_tag() const { return tag; }
 
+	/** Returns the architecture this tool build for.  May return null if the
+	tool is architecture-agnostic. */
+	const Architecture *get_architecture() const { return architecture; }
+
+	/** Overrides the command used by the tool.  The new command should accept
+	the same command line arguments.  Only works on tools that use an external
+	command.  If cross is true and the architecture is not native, a cross
+	prefix is added to the command.  May have no effect after prepare() has been
+	called. */
+	void set_command(const std::string &cmd, bool cross = false);
+
 	/** Returns a target for the tool's own executable.  If the tool does not
-	use an external program, returns null. */
+	use an external program, returns null.  The tool must be prepared first. */
 	FileTarget *get_executable() const { return executable; }
 
 	/// Returns a list of suffixes that can be processed with this tool.
@@ -59,6 +73,10 @@ public:
 	/// Returns the systemwide search path for source files.
 	const SearchPath &get_system_path() const { return system_path; }
 
+	/** Returns tool-specific build info.  This can be used by other tools down
+	the chain. */
+	const BuildInfo &get_build_info() const { return build_info; }
+
 	/// Creates a source file appropriate for this tool.
 	virtual Target *create_source(const Component &, const Msp::FS::Path &) const { return 0; }
 
@@ -86,11 +104,6 @@ public:
 protected:
 	virtual void do_prepare() { }
 
-	/** Locates an executable for the tool from the VFS.  If it isn't found, a
-	problem is reported.  If cross is true and the architecture is not native,
-	a cross prefix is added to the command. */
-	void set_executable(const std::string &command, bool cross = false);
-
 public:
 	const std::list<std::string> &get_problems() const { return problems; }