X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=943c8513cb5a90deb60173f5b29f164756836fb8;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=34afb92e91aafccdaef1896042404d251b9da8e9;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 34afb92..943c851 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -5,68 +5,147 @@
 #include <map>
 #include <string>
 #include <msp/core/application.h>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#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"
+#include "packagemanager.h"
+#include "problem.h"
+#include "target.h"
+#include "toolchain.h"
+#include "virtualfilesystem.h"
 
 class Analyzer;
+class FileTarget;
 class Package;
-class Target;
+class SourcePackage;
 
-class Builder: public Msp::Application
+/**
+The main application class.  Handles command line options and supervises the
+build process.
+*/
+class Builder: public Msp::RegisteredApplication<Builder>
 {
-public:
-	Builder(int, char **);
-	unsigned get_verbose() const { return verbose; }
-	Package  *get_package(const std::string &);
-	Target   *get_target(const std::string &);
-	Target   *get_header(const std::string &, const std::string &, const std::list<std::string> &);
-	Target   *get_library(const std::string &, const std::list<std::string> &);
-	int      main();
-	~Builder();
 private:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Builder>
 	{
+	private:
+		Msp::FS::Path src;
+
 	public:
-		Loader(Builder &, const Msp::Path::Path &);
+		Loader(Builder &, const Msp::FS::Path &);
 	private:
-		Builder &bld;
-		Msp::Path::Path src;
-		
+		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 &);
 	};
 
-	typedef std::map<std::string, Package *>   PackageMap;
-	typedef std::map<std::string, Target *>    TargetMap;
-	typedef std::map<std::string, std::string> ToolMap;
-	
-	std::list<std::string> cmdline_targets;
-	RawOptionMap cmdline_options;
-	
-	PackageMap  packages;
-	std::list<Package *> new_pkgs;
-	Package     *default_pkg;
-
-	TargetMap   targets;
-	std::list<Target *> new_tgts;
-	TargetMap   includes;
-	TargetMap   libraries;
-
-	ToolMap     tools;
-	unsigned    verbose;
-	Msp::Path::Path cwd;
-	Analyzer    *analyzer;
-	unsigned    jobs;
-	std::list<std::string> what_if;
-	bool        chrome;
-
-	int load_build_file(const Msp::Path::Path &);
-	int create_targets();
-	Target *check_header(const Msp::Path::Path &);
+public:
+	typedef std::map<std::string, Target *> TargetMap;
+
+private:
+	typedef std::map<std::string, BuildType> BuildTypeMap;
+
+	StringList cmdline_targets;
+	Config::InputOptions cmdline_options;
+	Msp::FS::Path cwd;
+
+	PackageManager package_manager;
+	SourcePackage *main_pkg;
+
+	TargetMap targets;
+
+	Architecture native_arch;
+	Architecture *current_arch;
+	BuildTypeMap build_types;
+	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;
+	Msp::FS::Path prefix;
+	Msp::FS::Path tempdir;
+	StringList warnings;
+
+	static std::string usagemsg;
+	static std::string helpmsg;
+
+public:
+	Builder(int, char **);
+	~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; }
+	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; }
+
+	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 *);
-	int build();
-	
-	static Msp::Application::RegApp<Builder> reg;
+
+	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 &);
+
+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();
+
+	/** 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();
+
+	int do_create_makefile();
+
+	/** Prints out information about the default package. */
+	void package_help();
 };
 
 #endif