X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.h;h=c49b4c473257b0ff06f8e2e07cca2a4fbc444b54;hb=9f885c3eec8f065b7dc400acfb9dd67158284fcf;hp=41b8c5f24dd92387ae4bf454653c3984d34694b5;hpb=82f1175238a94618b0cf1485b0132fb965996843;p=builder.git

diff --git a/source/tool.h b/source/tool.h
index 41b8c5f..c49b4c4 100644
--- a/source/tool.h
+++ b/source/tool.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "virtualfilesystem.h"
 
 class Architecture;
 class Builder;
@@ -28,19 +29,16 @@ public:
 		COMPONENT
 	};
 
-	typedef std::list<Msp::FS::Path> SearchPath;
-	typedef std::list<std::string> SuffixList;
-
 protected:
 	Builder &builder;
 	const Architecture *architecture;
 	std::string tag;
 	std::string command;
 	FileTarget *executable;
-	SuffixList input_suffixes;
-	SuffixList aux_suffixes;
+	std::list<std::string> input_suffixes;
+	std::list<std::string> aux_suffixes;
 	ProcessingUnit processing_unit;
-	SearchPath system_path;
+	VirtualFileSystem::SearchPath system_path;
 	BuildInfo build_info;
 	bool prepared;
 	std::list<std::string> problems;
@@ -68,11 +66,11 @@ public:
 	FileTarget *get_executable() const { return executable; }
 
 	/// Returns a list of suffixes that can be processed with this tool.
-	const SuffixList &get_input_suffixes() const { return input_suffixes; }
+	const std::list<std::string> &get_input_suffixes() const { return input_suffixes; }
 
 	/** Returns a list of suffixes that are associated with this tool, but can't
 	be processed directly.  For example C and C++ headers. */
-	const SuffixList &get_auxiliary_suffixes() const { return aux_suffixes; }
+	const std::list<std::string> &get_auxiliary_suffixes() const { return aux_suffixes; }
 
 	/** Indicates whether the tool can accept a suffix.  If aux is true,
 	auxiliary suffixes are considered as well */
@@ -82,7 +80,7 @@ public:
 	ProcessingUnit get_processing_unit() const { return processing_unit; }
 
 	/// Returns the systemwide search path for source files.
-	const SearchPath &get_system_path() const { return system_path; }
+	const VirtualFileSystem::SearchPath &get_system_path() const { return system_path; }
 
 	/** Returns tool-specific build info.  This can be used by other tools down
 	the chain. */
@@ -108,7 +106,7 @@ public:
 	null if the tool does not want to handle installing in a special way. */
 	virtual Target *create_install(Target &) const { return 0; }
 
-	virtual std::string create_build_signature(const BuildInfo &) const { return std::string(); }
+	virtual std::string create_build_signature(const BuildInfo &) const;
 
 	void prepare();
 
@@ -136,11 +134,11 @@ protected:
 	SubTool(Tool &);
 
 public:
-	virtual Target *create_source(const Component &, const Msp::FS::Path &) const;
-	virtual Target *create_source(const Msp::FS::Path &) const;
-	virtual Target *create_target(const std::list<Target *> &, const std::string & = std::string());
-	virtual Target *create_install(Target &) const;
-	virtual std::string create_build_signature(const BuildInfo &) const;
+	Target *create_source(const Component &, const Msp::FS::Path &) const override;
+	Target *create_source(const Msp::FS::Path &) const override;
+	Target *create_target(const std::list<Target *> &, const std::string & = std::string()) override;
+	Target *create_install(Target &) const override;
+	std::string create_build_signature(const BuildInfo &) const override;
 };