X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=6985db8cef39697864a60e74801f82e13f64c00f;hb=5d4bc56c55a3928d0a24f18d1ab06f243d39e0a7;hp=00bb2ad91b5ada766369243d5d1777965918ac84;hpb=4f78d9f016482ce1ac7d726852e33e07c090df1b;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 00bb2ad..6985db8 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -12,6 +12,7 @@
 #include "target.h"
 
 class Analyzer;
+class Config;
 class Package;
 
 /**
@@ -26,13 +27,16 @@ 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 StringList &);
-	Target   *get_library(const std::string &, const StringList &, unsigned);
+	Target   *get_header(const std::string &, const std::string &, const std::string &, const StringList &);
+	Target   *get_library(const std::string &, const std::string &, const StringList &, LibMode);
 	const Msp::Path::Path &get_cwd() const { return cwd; }
+	const std::string &get_arch_prefix(const std::string &) const;
+	std::string get_tool(const std::string &, const std::string &);
+	void     apply_profile_template(Config &, const std::string &) const;
 	int      main();
 	~Builder();
 
-	static void usage(const char *, bool);
+	static void usage(const char *, const char *, bool);
 private:
 	class Loader: public Msp::Parser::Loader
 	{
@@ -41,19 +45,20 @@ private:
 	private:
 		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;
-	
+	typedef std::map<std::string, StringMap>   ToolMap;
+	typedef std::map<std::string, StringMap>   ProfileTemplateMap;
+
 	StringList   cmdline_targets;
-	RawOptionMap cmdline_options;
+	StringMap    cmdline_options;
 	Msp::Path::Path cwd;
-	
+
 	PackageMap   packages;
 	PackageList  new_pkgs;
 	Package      *default_pkg;
@@ -63,30 +68,36 @@ private:
 	TargetMap    includes;
 	TargetMap    libraries;
 
-	ToolMap      tools;    /// Not used yet
-	
+	ToolMap      tools;    //< arch, tool name -> program name
+	StringMap    archs;    //< arch -> prefix
+	ProfileTemplateMap profile_tmpl;
+
 	Analyzer        *analyzer;
-	bool            do_build;
+	bool            build;
+	unsigned        clean;
 	bool            dry_run;
 	bool            help;
 	unsigned        verbose;
 	bool            chrome;
-	Msp::Path::Path build_file;
+	std::string     build_file;
 	unsigned        jobs;
 	StringList      what_if;
 	bool            conf_all;
 	bool            conf_only;
 	bool            build_all;
+	bool            create_makefile;
 
 	int    load_build_file(const Msp::Path::Path &);
 	int    create_targets();
 	Target *get_header(const Msp::Path::Path &);
-	Target *get_library(const std::string &, const Msp::Path::Path &, unsigned);
+	Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
 	void   add_target(Target *);
 	void   update_hash(std::string &, const std::string &);
-	int    build();
+	int    do_build();
+	int    do_clean();
+	int    do_create_makefile();
 	void   package_help();
-	
+
 	static Msp::Application::RegApp<Builder> reg;
 };