X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=385468210fc2590b433d6d426075dadc73a98224;hb=b6dcf65b5e1b99f6c65454358c7610f3e9c8af2b;hp=1016498f08b736e3517e45f269079e78b76cc13f;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 1016498..3854682 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -12,6 +12,7 @@
 #include "target.h"
 
 class Analyzer;
+class Config;
 class Package;
 
 /**
@@ -27,12 +28,15 @@ public:
 	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 &);
+	Target   *get_library(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
 	{
@@ -48,10 +52,11 @@ private:
 	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;
@@ -63,7 +68,9 @@ 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;
@@ -71,15 +78,17 @@ private:
 	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;
 
 	int    load_build_file(const Msp::Path::Path &);
 	int    create_targets();
-	Target *check_header(const Msp::Path::Path &);
+	Target *get_header(const Msp::Path::Path &);
+	Target *get_library(const std::string &, const Msp::Path::Path &, LibMode);
 	void   add_target(Target *);
 	void   update_hash(std::string &, const std::string &);
 	int    build();