X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=19885c56291729d971776ec57a3295c546073edb;hb=refs%2Ftags%2F0.9;hp=4811493e005e649dcaeba5f24c89f976a880454d;hpb=1968c546cfb30214e8dc5afc722bec14aa8373f5;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 4811493..19885c5 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -13,7 +13,8 @@ Distributed under the LGPL
 #include <string>
 #include <msp/core/application.h>
 #include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/fs/path.h>
+#include "architecture.h"
 #include "config.h"
 #include "misc.h"
 #include "problem.h"
@@ -38,11 +39,13 @@ public:
 	SourcePackage *get_main_package() const { return main_pkg; }
 	Target   *get_target(const std::string &) const;
 	const TargetMap &get_targets() const { return targets; }
-	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 &);
+	Target   *get_header(const std::string &, const std::string &, const StringList &);
+	Target   *get_library(const std::string &, const StringList &, LibMode);
+	const Msp::FS::Path &get_cwd() const { return cwd; }
+	const Architecture &get_architecture(const std::string &) const;
+	const Architecture &get_current_arch() const;
+	const Msp::FS::Path &get_prefix() const { return prefix; }
+	const StringList &get_warnings() const { return warnings; }
 	void     apply_profile_template(Config &, const std::string &) const;
 	void     add_target(Target *);
 	void     problem(const std::string &, const std::string &);
@@ -54,12 +57,12 @@ private:
 	class Loader: public Msp::DataFile::Loader
 	{
 	public:
-		Loader(Builder &, const Msp::Path::Path &);
+		Loader(Builder &, const Msp::FS::Path &);
 	private:
-		Builder         &bld;
-		Msp::Path::Path src;
+		Builder       &bld;
+		Msp::FS::Path src;
 
-		void architecture(const std::string &, const std::string &);
+		void architecture(const std::string &);
 		void binpkg(const std::string &);
 		void profile(const std::string &);
 		void package(const std::string &);
@@ -77,23 +80,23 @@ private:
 
 	typedef std::list<Package *>               PackageList;
 	typedef std::map<std::string, Package *>   PackageMap;
-	typedef std::map<std::string, StringMap>   ToolMap;
 	typedef std::map<std::string, StringMap>   ProfileTemplateMap;
 
 	StringList   cmdline_targets;
 	StringMap    cmdline_options;
-	Msp::Path::Path cwd;
+	Msp::FS::Path cwd;
 
 	PackageMap   packages;
 	SourcePackage *main_pkg;
+	PathList     pkg_path;
+	PathList     pkg_dirs;
 
 	TargetMap    targets;
 	TargetList   new_tgts;
 	TargetMap    includes;
 	TargetMap    libraries;
 
-	ToolMap      tools;    //< arch, tool name -> program name
-	StringMap    archs;    //< arch -> prefix
+	ArchMap      archs;
 	ProfileTemplateMap profile_tmpl;
 
 	ProblemList     problems;
@@ -103,7 +106,7 @@ private:
 	bool            dry_run;
 	bool            help;
 	unsigned        verbose;
-	bool            chrome;
+	bool            show_progress;
 	std::string     build_file;
 	unsigned        jobs;
 	StringList      what_if;
@@ -111,11 +114,15 @@ private:
 	bool            conf_only;
 	bool            build_all;
 	bool            create_makefile;
+	std::string     current_arch;
+	Msp::FS::Path   prefix;
+	StringList      warnings;
 
-	int    load_build_file(const Msp::Path::Path &);
+	Msp::FS::Path get_package_location(const std::string &);
+	int    load_build_file(const Msp::FS::Path &);
 	int    create_targets();
-	Target *get_header(const Msp::Path::Path &);
-	Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
+	Target *get_header(const Msp::FS::Path &);
+	Target *get_library(const std::string &, const Msp::FS::Path &, LibMode);
 	void   update_hash(std::string &, const std::string &);
 	int    do_build();
 	int    do_clean();