X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=400be8a5de392fb0d37ad54db5e55b7db9650001;hb=7e17b52f23dbbf06b425f69f4b8a84867e2f0597;hp=f66b31096773f35c04c01aac3a343314a066271d;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index f66b310..400be8a 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -4,10 +4,12 @@
 #include <list>
 #include <map>
 #include <string>
-#include <msp/framework/application.h>
+#include <msp/core/application.h>
 #include <msp/parser/loader.h>
 #include <msp/path/path.h>
+#include "config.h"
 
+class Analyzer;
 class Package;
 class Target;
 
@@ -16,10 +18,13 @@ class Builder: public Msp::Application
 public:
 	Builder(int, char **);
 	unsigned get_verbose() const { return verbose; }
+	bool     get_dry_run() const { return dry_run; }
 	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
 	{
@@ -32,23 +37,40 @@ private:
 		void package(const std::string &);
 	};
 
-	typedef std::map<std::string, Package *> PackageMap;
-	typedef std::map<std::string, Target *>  TargetMap;
+	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;
-	TargetMap  targets;
-	PackageMap packages;
-	unsigned   verbose;
-	Package    *default_pkg;
-	Msp::Path::Path cwd;
+	RawOptionMap cmdline_options;
+	
+	PackageMap  packages;
 	std::list<Package *> new_pkgs;
-	TargetMap  includes;
+	Package     *default_pkg;
+
+	TargetMap   targets;
 	std::list<Target *> new_tgts;
+	TargetMap   includes;
+	TargetMap   libraries;
+
+	ToolMap     tools;
+	unsigned    verbose;
+	Msp::Path::Path cwd;
+	Msp::Path::Path build_file;
+	bool        do_build;
+	bool        dry_run;
+	Analyzer    *analyzer;
+	unsigned    jobs;
+	std::list<std::string> what_if;
+	bool        chrome;
+	bool        conf_all;
 
 	int load_build_file(const Msp::Path::Path &);
-	void create_targets();
+	int create_targets();
 	Target *check_header(const Msp::Path::Path &);
 	void add_target(Target *);
+	void update_hash(std::string &, const std::string &);
+	int build();
 	
 	static Msp::Application::RegApp<Builder> reg;
 };