X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=5d62a9a1ec759b1d6d2e06eb91aa363cfcb617a6;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=aef0f47d3a8eb6389748a93aa14f1e0aa77ea7a7;hpb=1dad660f7bbda5ef3239fd6374e0f8a77e19eaaa;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index aef0f47..5d62a9a 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,7 +1,6 @@
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
-#include <list>
 #include <map>
 #include <string>
 #include <msp/datafile/loader.h>
@@ -12,7 +11,6 @@
 #include "config.h"
 #include "logger.h"
 #include "packagemanager.h"
-#include "problem.h"
 #include "target.h"
 #include "toolchain.h"
 #include "virtualfilesystem.h"
@@ -22,8 +20,8 @@ class Package;
 class SourcePackage;
 
 /**
-The main application class.  Handles command line options and supervises the
-build process.
+This class ties everything else together.  It also contains code for loading
+build files and supervising the build process.
 */
 class Builder
 {
@@ -42,21 +40,15 @@ private:
 		void architecture(const std::string &);
 		void binpkg(const std::string &);
 		void build_type(const std::string &);
-		void profile(const std::string &);
 		void package(const std::string &);
 	};
 
-public:
-	typedef std::list<Problem> ProblemList;
-
 private:
-	typedef std::map<std::string, BuildType> BuildTypeMap;
-
 	PackageManager package_manager;
 
 	Architecture native_arch;
 	Architecture *current_arch;
-	BuildTypeMap build_types;
+	std::map<std::string, BuildType> build_types;
 	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
@@ -64,7 +56,6 @@ private:
 	Logger default_logger;
 	const Logger *logger;
 
-	ProblemList problems;
 	Msp::FS::Path prefix;
 	Msp::FS::Path tempdir;
 
@@ -80,7 +71,8 @@ public:
 	const Architecture &get_current_arch() const { return *current_arch; }
 	const Architecture &get_native_arch() const { return native_arch; }
 	void set_build_type(const std::string &);
-	const BuildType &get_build_type() const { return *build_type; }
+	std::vector<std::string> get_build_types() const;
+	const BuildType &get_build_type() const;
 	BuildGraph &get_build_graph() { return build_graph; }
 	void set_prefix(const Msp::FS::Path &);
 	void set_temp_directory(const Msp::FS::Path &);
@@ -93,15 +85,15 @@ public:
 	void set_logger(const Logger *);
 	const Logger &get_logger() const { return *logger; }
 
-	void problem(const std::string &, const std::string &);
-	const ProblemList &get_problems() const { return problems; }
+	std::vector<std::string> collect_problems() const;
 
 	/** Loads a build file.  If opts is not null, it is used to configure any
 	packages loaded from this file.  If all is true, external packages are also
 	configured. */
 	void load_build_file(const Msp::FS::Path &, const Config::InputOptions *opts = 0, bool all = false);
 
-	void load_build_file(const Msp::FS::Path &, const Config::InputOptions &, bool);
+	/** Saves package configuration and dependency caches. */
+	void save_caches();
 
 	/** Builds the goal targets.  The build graph must be prepared first. */
 	int build(unsigned jobs = 1, bool dry_run = false, bool show_progress = false);