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

diff --git a/source/builder.h b/source/builder.h
index 4b0bee3..b6c9ebc 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -19,24 +19,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 &);
@@ -52,7 +49,7 @@ private:
 	typedef std::map<std::string, BuildType> BuildTypeMap;
 
 	StringList cmdline_targets;
-	StringMap cmdline_options;
+	Config::InputOptions cmdline_options;
 	Msp::FS::Path cwd;
 
 	PackageManager package_manager;
@@ -83,7 +80,7 @@ private:
 	bool build_all;
 	bool create_makefile;
 	Msp::FS::Path prefix;
-	StringList warnings;
+	Msp::FS::Path tempdir;
 
 	static std::string usagemsg;
 	static std::string helpmsg;
@@ -96,18 +93,17 @@ public:
 	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; }
@@ -117,6 +113,12 @@ public:
 	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 &);
+
 	void problem(const std::string &, const std::string &);
 
 	static void usage(const char *, const char *, bool);
@@ -126,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();