X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=70ca861bc64cefb22c13c7d91c98eacfbef61a15;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=cdf615d768383d9691371c2c2e186f7dabad5b4c;hpb=398983749391592988daca0c9b62b3d38f86e4e6;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index cdf615d..70ca861 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -4,62 +4,50 @@
 #include <list>
 #include <map>
 #include <string>
-#include <msp/core/application.h>
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include "architecture.h"
+#include "buildgraph.h"
 #include "buildtype.h"
 #include "config.h"
 #include "logger.h"
-#include "misc.h"
 #include "packagemanager.h"
-#include "problem.h"
 #include "target.h"
 #include "toolchain.h"
 #include "virtualfilesystem.h"
 
-class Analyzer;
-class Config;
 class FileTarget;
 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: public Msp::RegisteredApplication<Builder>
+class Builder
 {
 private:
 	class Loader: public Msp::DataFile::ObjectLoader<Builder>
 	{
 	private:
-		Msp::FS::Path src;
+		const Config::InputOptions *options;
+		bool conf_all;
 
 	public:
-		Loader(Builder &, const Msp::FS::Path &);
+		Loader(Builder &, const Config::InputOptions * = 0, bool = false);
+		~Loader();
+
 	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::map<std::string, Target *> TargetMap;
-
 private:
 	typedef std::map<std::string, BuildType> BuildTypeMap;
 
-	StringList cmdline_targets;
-	StringMap cmdline_options;
-	Msp::FS::Path cwd;
-
 	PackageManager package_manager;
-	SourcePackage *main_pkg;
-
-	TargetMap targets;
 
 	Architecture native_arch;
 	Architecture *current_arch;
@@ -67,86 +55,57 @@ private:
 	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
-	Logger logger;
-
-	ProblemList problems;
-	Analyzer *analyzer;
-	bool build;
-	unsigned clean;
-	bool dry_run;
-	bool help;
-	bool show_progress;
-	std::string build_file;
-	unsigned jobs;
-	StringList what_if;
-	bool conf_all;
-	bool conf_only;
-	bool build_all;
-	bool create_makefile;
+	BuildGraph build_graph;
+	Logger default_logger;
+	const Logger *logger;
+
 	Msp::FS::Path prefix;
 	Msp::FS::Path tempdir;
-	StringList warnings;
 
-	static std::string usagemsg;
-	static std::string helpmsg;
+	Loader *top_loader;
 
 public:
-	Builder(int, char **);
+	Builder();
 	~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; }
+	void set_architecture(const std::string &);
 	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 &);
+	std::vector<std::string> get_build_types() const;
+	const BuildType &get_build_type() const { return *build_type; }
+	BuildGraph &get_build_graph() { return build_graph; }
+	void set_prefix(const Msp::FS::Path &);
+	void set_temp_directory(const Msp::FS::Path &);
 	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 add_default_tools();
 	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 set_logger(const Logger *);
+	const Logger &get_logger() const { return *logger; }
 
-	void problem(const std::string &, const std::string &);
+	std::list<std::string> collect_problems() const;
 
-	static void usage(const char *, const char *, bool);
+	/** 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);
 
-	/** 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 &);
+	/** Saves package configuration and dependency caches. */
+	void save_caches();
 
-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();
-
-	/** Supervises the build process, starting new actions when slots become
-	available. */
-	int do_build();
+	/** Builds the goal targets.  The build graph must be prepared first. */
+	int build(unsigned jobs = 1, bool dry_run = false, bool show_progress = false);
 
-	/** Cleans buildable targets.  If clean is 1, cleans only the default
-	package.  If clean is 2 or greater, cleans all buildable packages.
-	*/
-	int do_clean();
+	/** Cleans buildable targets.  If all is true, cleans all packages.
+	Otherwise cleans only the default package. */
+	int clean(bool all = false, bool dry_run = false);
 
 	int do_create_makefile();
-
-	/** Prints out information about the default package. */
-	void package_help();
 };
 
 #endif