X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.h;h=60e198ad3b2dcf866c2be8f67094e054edf146e9;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=aef6ab09392a6cafc83a1f68d58abb295a6f709b;hpb=903a5727ef1f8a7f540e162139396163c736d484;p=builder.git

diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h
index aef6ab0..60e198a 100644
--- a/source/virtualfilesystem.h
+++ b/source/virtualfilesystem.h
@@ -1,13 +1,16 @@
 #ifndef VIRTUALFILESYSTEM_H_
 #define VIRTUALFILESYSTEM_H_
 
-#include <list>
 #include <map>
+#include <set>
+#include <vector>
 #include <msp/fs/path.h>
+#include "buildinfo.h"
 
 class Builder;
 class FileTarget;
 class Pattern;
+class Tool;
 
 /**
 Provides access to the filesystem in a way that takes known targets into
@@ -17,17 +20,16 @@ possible to build them.
 class VirtualFileSystem
 {
 public:
-	typedef std::list<Msp::FS::Path> SearchPath;
+	using SearchPath = std::vector<Msp::FS::Path>;
 
 private:
-	typedef std::map<Msp::FS::Path, FileTarget *> TargetMap;
-
 	Builder &builder;
-	TargetMap targets;
+	std::map<Msp::FS::Path, FileTarget *> targets;
 	std::set<Msp::FS::Path> nonexistent;
+	SearchPath sys_bin_path;
 
 public:
-	VirtualFileSystem(Builder &);
+	VirtualFileSystem(Builder &b): builder(b) { }
 
 	/** Gets an existing target associated with a path.  If no target has claimed
 	that path, 0 is returned. */
@@ -38,14 +40,21 @@ public:
 	void register_path(const Msp::FS::Path &, FileTarget *);
 
 	/** Locates a source file.  If a file is found but no target is associated
-	with it, a new package-less target is created with the appropriate tool. */
-	FileTarget *find_header(const std::string &, const SearchPath &);
+	with it, a new package-less target is created with the appropriate tool.  If
+	use_syspath is true, the system path reported by the tool is also searched. */
+	FileTarget *find_header(const std::string &, Tool *, const SearchPath &, bool use_syspath = true);
 
 	/** Locates a library.  The library name should be the same as what would be
 	used in linking with the library.  If a file is found but no target is
 	associated with it, a new package-less target of appropriate type is
-	created. */
-	FileTarget *find_library(const std::string &, const SearchPath &, LibMode);
+	created.  If use_syspath is true, the system path reported by the LINK tool
+	is also searched. */
+	FileTarget *find_library(const std::string &, const SearchPath &, BuildInfo::LibraryMode, bool use_syspath = true);
+
+	/** Locates a binary.  The normal search path for binaries is used (usually
+	this means the PATH environment variable).  If a file is found but no target
+	is associated with it, a new package-less Executable target is created. */
+	FileTarget *find_binary(const std::string &);
 
 private:
 	bool file_exists(const Msp::FS::Path &);