X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=cd6bf16d34fd950ea68ce0fc14a3506ce3e814b6;hb=4ce2beaa6d1cab7ed8063bbe1472e13a4280ebc0;hp=0dc16d175d5c75cfbd60a3f60db1a96f50af2dc0;hpb=8b9f2196ec0a930992614f174b7970c2ed523699;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 0dc16d1..cd6bf16 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,7 +8,9 @@
 #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"
 #include "packagemanager.h"
 #include "problem.h"
@@ -21,46 +23,34 @@ 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;
@@ -73,10 +63,11 @@ 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;
 
 	ProblemList problems;
 	Analyzer *analyzer;
@@ -84,7 +75,6 @@ private:
 	unsigned clean;
 	bool dry_run;
 	bool help;
-	unsigned verbose;
 	bool show_progress;
 	std::string build_file;
 	unsigned jobs;
@@ -104,7 +94,6 @@ public:
 	~Builder();
 
 	int main();
-	unsigned get_verbose() const { return verbose; }
 	bool get_dry_run() const { return dry_run; }
 
 	PackageManager &get_package_manager() { return package_manager; }
@@ -120,15 +109,14 @@ public:
 	const Architecture &get_native_arch() const { return native_arch; }
 	const Msp::FS::Path &get_prefix() const { return prefix; }
 	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; }
+	const Logger &get_logger() const { return logger; }
 
 	/** 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 &);