X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=67b337553b2ebbfba0df6427b798cb876c7d465e;hb=e15bd086a1ef924b7986d18a1c5b3d31f54a01de;hp=4b0bee33494636b2d5bb6392a001f458f728f4a8;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 4b0bee3..67b3375 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -11,7 +11,6 @@
 #include "buildtype.h"
 #include "config.h"
 #include "logger.h"
-#include "misc.h"
 #include "packagemanager.h"
 #include "problem.h"
 #include "target.h"
@@ -19,24 +18,21 @@
 #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>
 {
 private:
 	class Loader: public Msp::DataFile::ObjectLoader<Builder>
 	{
-	private:
-		Msp::FS::Path src;
-
 	public:
-		Loader(Builder &, const Msp::FS::Path &);
+		Loader(Builder &);
 	private:
 		void architecture(const std::string &);
 		void binpkg(const std::string &);
@@ -49,10 +45,12 @@ public:
 	typedef std::map<std::string, Target *> TargetMap;
 
 private:
+	typedef std::list<std::string> NameList;
 	typedef std::map<std::string, BuildType> BuildTypeMap;
+	typedef std::list<Problem> ProblemList;
 
-	StringList cmdline_targets;
-	StringMap cmdline_options;
+	NameList cmdline_targets;
+	Config::InputOptions cmdline_options;
 	Msp::FS::Path cwd;
 
 	PackageManager package_manager;
@@ -77,13 +75,13 @@ private:
 	bool show_progress;
 	std::string build_file;
 	unsigned jobs;
-	StringList what_if;
+	NameList what_if;
 	bool conf_all;
 	bool conf_only;
 	bool build_all;
 	bool create_makefile;
 	Msp::FS::Path prefix;
-	StringList warnings;
+	Msp::FS::Path tempdir;
 
 	static std::string usagemsg;
 	static std::string helpmsg;
@@ -93,45 +91,53 @@ public:
 	~Builder();
 
 	int main();
-	bool get_dry_run() const { return dry_run; }
 
 	PackageManager &get_package_manager() { return package_manager; }
-	SourcePackage *get_main_package() const { return main_pkg; }
 
 	/** Looks up a target by name.  Returns 0 if no such target exists. */
 	Target *get_target(const std::string &) const;
 
 	const TargetMap &get_targets() const { return targets; }
 
-	const Msp::FS::Path &get_cwd() const { return cwd; }
+	const Msp::FS::Path &get_work_directory() const { return cwd; }
 	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 StringList &get_warnings() const { return warnings; }
+	const Msp::FS::Path &get_temp_directory() const { return tempdir; }
 
 	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. */
+	/** Adds a target.  It can later be retrieved by name.  Called from Target
+	constructor. */
 	void add_target(Target *);
 
+	/** Adds a target that is a primary build goal.  Such targets will be added
+	as dependencies of the "world" virtual target.  If the target belongs to a
+	default component of the main package, it's also added to the "default"
+	virtual target. */
+	void add_primary_target(Target &);
+
+	/** Adds a target that will be installed.  A new InstalledFile target is
+	created and added as a dependency to the "install" virtual target. */
+	void add_installed_target(Target &);
+
 	void problem(const std::string &, const std::string &);
 
 	static void usage(const char *, const char *, bool);
 
 	/** Loads a build file.  Returns 0 on success or -1 if the file could not be
 	opened. */
-	int load_build_file(const Msp::FS::Path &);
+	void 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();