X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=7a33ab8f86d6022a142e99eaad17d9f3da8e59ff;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=a4fc14b5d8b8343c99ca7fbacb0db7faafe7a73b;hpb=409a427f912f9c203b102beed0816b53b250931f;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index a4fc14b..7a33ab8 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
@@ -19,6 +12,8 @@ Distributed under the LGPL
 #include "misc.h"
 #include "problem.h"
 #include "target.h"
+#include "toolchain.h"
+#include "virtualfilesystem.h"
 
 class Analyzer;
 class Config;
@@ -59,6 +54,11 @@ private:
 		void option(const std::string &, const std::string &);
 	};
 
+public:
+	typedef std::map<std::string, Target *> TargetMap;
+	typedef std::list<Target *> TargetList;
+
+private:
 	typedef std::list<Package *> PackageList;
 	typedef std::map<std::string, Package *> PackageMap;
 	typedef std::map<std::string, StringMap> ProfileTemplateMap;
@@ -75,13 +75,13 @@ private:
 
 	TargetMap targets;
 	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;
@@ -126,19 +126,6 @@ public:
 
 	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,10 +133,13 @@ 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(FileTarget *);
-	void add_target(VirtualTarget *);
+	void add_target(Target *);
+	void register_path(const Msp::FS::Path &, FileTarget *);
 
 	void problem(const std::string &, const std::string &);
 
@@ -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();