X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=786b48c37f8f1752a8fbe17630d80aeacf5196e1;hb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;hp=3dba62920a48d1821f242c3d915e550e041aa843;hpb=4fcc283a4bb1f695bd124006906bcdaba053193f;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 3dba629..786b48c 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -8,10 +8,11 @@
 #include <msp/parser/loader.h>
 #include <msp/path/path.h>
 #include "config.h"
+#include "misc.h"
+#include "target.h"
 
 class Analyzer;
 class Package;
-class Target;
 
 class Builder: public Msp::Application
 {
@@ -22,8 +23,8 @@ public:
 	bool     get_build_all() const { return build_all; }
 	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> &);
+	Target   *get_header(const std::string &, const std::string &, const StringList &);
+	Target   *get_library(const std::string &, const StringList &);
 	const Msp::Path::Path &get_cwd() const { return cwd; }
 	int      main();
 	~Builder();
@@ -35,49 +36,51 @@ private:
 	public:
 		Loader(Builder &, const Msp::Path::Path &);
 	private:
-		Builder &bld;
+		Builder         &bld;
 		Msp::Path::Path src;
 		
 		void package(const std::string &);
 	};
 
+	typedef std::list<Package *>               PackageList;
 	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;
+	StringList   cmdline_targets;
 	RawOptionMap cmdline_options;
+	Msp::Path::Path cwd;
 	
-	PackageMap  packages;
-	std::list<Package *> new_pkgs;
-	Package     *default_pkg;
+	PackageMap   packages;
+	PackageList  new_pkgs;
+	Package      *default_pkg;
 
-	TargetMap   targets;
-	std::list<Target *> new_tgts;
-	TargetMap   includes;
-	TargetMap   libraries;
+	TargetMap    targets;
+	TargetList   new_tgts;
+	TargetMap    includes;
+	TargetMap    libraries;
 
-	ToolMap     tools;
-	unsigned    verbose;
-	Msp::Path::Path cwd;
+	ToolMap      tools;    /// Not used yet
+	
+	Analyzer        *analyzer;
+	bool            do_build;
+	bool            dry_run;
+	bool            help;
+	unsigned        verbose;
+	bool            chrome;
 	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;
-	bool        build_all;
-	bool        help;
+	unsigned        jobs;
+	StringList      what_if;
+	bool            conf_all;
+	bool            build_all;
 
-	int load_build_file(const Msp::Path::Path &);
-	int create_targets();
+	int    load_build_file(const Msp::Path::Path &);
+	int    create_targets();
 	Target *check_header(const Msp::Path::Path &);
-	void add_target(Target *);
-	void update_hash(std::string &, const std::string &);
-	int build();
-	void package_help();
+	void   add_target(Target *);
+	void   update_hash(std::string &, const std::string &);
+	int    build();
+	void   package_help();
 	
 	static Msp::Application::RegApp<Builder> reg;
 };