X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=55af18a5a2e9b4db855bcefdb67cf84cb9386d89;hb=64f01c486e48f260a5d895092806ee341ef23198;hp=4192fe767a7dfdc788a050298d6ead0dbbaad2e9;hpb=5c25b76c7263b2a8ac01c863e438592c6287758a;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 4192fe7..55af18a 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,13 +19,13 @@
 #include "virtualfilesystem.h"
 
 class Analyzer;
-class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
 
 /**
-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>
 {
@@ -39,29 +40,19 @@ private:
 	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 &);
 	};
 
-	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;
 
 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;
@@ -71,7 +62,8 @@ private:
 
 	Architecture native_arch;
 	Architecture *current_arch;
-	ProfileTemplateMap profile_tmpl;
+	BuildTypeMap build_types;
+	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
 	Logger logger;
@@ -91,6 +83,7 @@ private:
 	bool build_all;
 	bool create_makefile;
 	Msp::FS::Path prefix;
+	Msp::FS::Path tempdir;
 	StringList warnings;
 
 	static std::string usagemsg;
@@ -115,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; }
@@ -135,12 +128,12 @@ public:
 	int load_build_file(const Msp::FS::Path &);
 
 private:
-	/** Creates targets for all packages and prepares them for building.
-	Returns 0 if everything went ok, -1 if something bad happened and a build
-	shouldn't be attempted. */
-	int create_targets();
+	/** Prepares packages and targets for building.  Returns true if everything
+	went ok, or false if something bad happened and a build shouldn't be
+	attempted. */
+	bool prepare_build();
 
-	/** Supervises the build process, starting new actions when slots become
+	/** Supervises the build process, starting new tasks when slots become
 	available. */
 	int do_build();