X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=7a33ab8f86d6022a142e99eaad17d9f3da8e59ff;hb=be6c1ae1dcc97cb3e3019c0384f1bc933fcd321c;hp=44bf878b4efa1e1b24d4793b669a1b08e5b342dc;hpb=c52efe77690dcf620d3b19f750a91422f771942d;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 44bf878..7a33ab8 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -12,6 +12,8 @@
 #include "misc.h"
 #include "problem.h"
 #include "target.h"
+#include "toolchain.h"
+#include "virtualfilesystem.h"
 
 class Analyzer;
 class Config;
@@ -54,6 +56,7 @@ private:
 
 public:
 	typedef std::map<std::string, Target *> TargetMap;
+	typedef std::list<Target *> TargetList;
 
 private:
 	typedef std::list<Package *> PackageList;
@@ -71,15 +74,14 @@ private:
 	bool no_externals;
 
 	TargetMap targets;
-	TargetMap targets_by_path;
 	TargetList new_tgts;
-	TargetMap includes;
-	TargetMap libraries;
 
 	Architecture native_arch;
 	Architecture *current_arch;
 	StringMap cross_prefixes;
 	ProfileTemplateMap profile_tmpl;
+	Toolchain toolchain;
+	VirtualFileSystem vfs;
 
 	ProblemList problems;
 	Analyzer *analyzer;
@@ -122,23 +124,8 @@ public:
 	/** Looks up a target by name.  Returns 0 if no such target exists. */
 	Target *get_target(const std::string &) const;
 
-	FileTarget *get_target_by_path(const Msp::FS::Path &) const;
-
 	const TargetMap &get_targets() const { return targets; }
 
-	/** Tries to locate a header based on location of including file and include
-	path.  Considers known targets as well as existing files.  If a matching
-	target is not found but a file exists, a new SystemHeader target will be
-	created and returned. */
-	Target *get_header(const std::string &, const Msp::FS::Path &, const StringList &);
-
-	/** Tries to locate a library in a library path.  The library name should be
-	the same as would be given to the linker with -l, i.e. without the "lib"
-	prefix or extension.  Considers known targets as well as existing files.  If
-	a matching target is not found but a file exists, a new SystemLibrary target
-	will be created and returned. */
-	Target *get_library(const std::string &, const StringList &, LibMode);
-
 	const Msp::FS::Path &get_cwd() const { return cwd; }
 	const Architecture &get_current_arch() const { return *current_arch; }
 	const Architecture &get_native_arch() const { return native_arch; }
@@ -146,6 +133,9 @@ public:
 	const StringList &get_warnings() const { return warnings; }
 	void apply_profile_template(Config &, const std::string &) const;
 
+	const Toolchain &get_toolchain() const { return toolchain; }
+	VirtualFileSystem &get_vfs() { return vfs; }
+
 	/** Adds a target to both the target map and the new target queue.  Called
 	from Target constructor. */
 	void add_target(Target *);
@@ -169,15 +159,6 @@ private:
 	shouldn't be attempted. */
 	int create_targets();
 
-	/**
-	Check if a header exists, either as a target or a file.  Returns an existing
-	target of one was found, or a new SystemHeader target if there was no known
-	target but the file exists.
-	*/
-	Target *get_header(const Msp::FS::Path &);
-
-	Target *get_library(const std::string &, const Msp::FS::Path &, LibMode);
-
 	/** Supervises the build process, starting new actions when slots become
 	available. */
 	int do_build();