X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=66194a27c3e4cf3dccf81a6aacc2dee2b31fd9b0;hb=c45cc6fd2b13513909d43b5f95370b00c8b4c25e;hp=cd6bf16d34fd950ea68ce0fc14a3506ce3e814b6;hpb=a116ad9af4a6a75093f6e1c3603d16b397833154;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index cd6bf16..66194a2 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,10 +8,10 @@
 #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"
@@ -19,7 +19,6 @@
 #include "virtualfilesystem.h"
 
 class Analyzer;
-class Config;
 class FileTarget;
 class Package;
 class SourcePackage;
@@ -33,11 +32,8 @@ 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 &);
@@ -46,20 +42,16 @@ private:
 		void package(const std::string &);
 	};
 
-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;
-	SourcePackage *main_pkg;
-
-	TargetMap targets;
 
 	Architecture native_arch;
 	Architecture *current_arch;
@@ -67,6 +59,7 @@ private:
 	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
+	BuildGraph build_graph;
 	Logger logger;
 
 	ProblemList problems;
@@ -78,13 +71,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;
@@ -94,45 +87,34 @@ 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 Architecture &get_current_arch() const { return *current_arch; }
 	const Architecture &get_native_arch() const { return native_arch; }
+	BuildGraph &get_build_graph() { return build_graph; }
 	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. */
-	void add_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();