X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=943c8513cb5a90deb60173f5b29f164756836fb8;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=78244e8c2980081bfcfb43ff85558cad443cddad;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 78244e8..943c851 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,6 +8,7 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include "architecture.h"
+#include "buildtype.h"
 #include "config.h"
 #include "logger.h"
 #include "misc.h"
@@ -18,53 +19,40 @@
 #include "virtualfilesystem.h"
 
 class Analyzer;
-class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
-class VirtualTarget;
 
 /**
-The main application class.  Controls and owns everything.  Rules the world.
+The main application class.  Handles command line options and supervises the
+build process.
 */
 class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Builder>
 	{
 	private:
-		Builder &bld;
 		Msp::FS::Path src;
 
 	public:
 		Loader(Builder &, const Msp::FS::Path &);
 	private:
+		void architecture(const std::string &);
 		void binpkg(const std::string &);
-		void cross_prefix(const std::string &, const std::string &);
+		void build_type(const std::string &);
 		void profile(const std::string &);
 		void package(const std::string &);
 	};
 
-	class ProfileLoader: public Msp::DataFile::Loader
-	{
-	private:
-		StringMap &profile;
-
-	public:
-		ProfileLoader(StringMap &);
-	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::map<std::string, StringMap> ProfileTemplateMap;
+	typedef std::map<std::string, BuildType> BuildTypeMap;
 
 	StringList cmdline_targets;
-	StringMap cmdline_options;
+	Config::InputOptions cmdline_options;
 	Msp::FS::Path cwd;
 
 	PackageManager package_manager;
@@ -74,8 +62,8 @@ private:
 
 	Architecture native_arch;
 	Architecture *current_arch;
-	StringMap cross_prefixes;
-	ProfileTemplateMap profile_tmpl;
+	BuildTypeMap build_types;
+	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
 	Logger logger;
@@ -95,6 +83,7 @@ private:
 	bool build_all;
 	bool create_makefile;
 	Msp::FS::Path prefix;
+	Msp::FS::Path tempdir;
 	StringList warnings;
 
 	static std::string usagemsg;
@@ -119,8 +108,8 @@ public:
 	const Architecture &get_current_arch() const { return *current_arch; }
 	const Architecture &get_native_arch() const { return native_arch; }
 	const Msp::FS::Path &get_prefix() const { return prefix; }
+	const Msp::FS::Path &get_temp_directory() const { return tempdir; }
 	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; }
@@ -129,7 +118,6 @@ public:
 	/** Adds a target to both the target map and the new target queue.  Called
 	from Target constructor. */
 	void add_target(Target *);
-	void register_path(const Msp::FS::Path &, FileTarget *);
 
 	void problem(const std::string &, const std::string &);