X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=4811493e005e649dcaeba5f24c89f976a880454d;hb=1968c546cfb30214e8dc5afc722bec14aa8373f5;hp=291c14b66662b1a68d37efa480e0dff6d6511333;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 291c14b..4811493 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -12,15 +12,17 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/core/application.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/path.h>
 #include "config.h"
 #include "misc.h"
+#include "problem.h"
 #include "target.h"
 
 class Analyzer;
 class Config;
 class Package;
+class SourcePackage;
 
 /**
 The main application class.  Controls and owns everything.  Rules the world.
@@ -33,8 +35,9 @@ public:
 	bool     get_dry_run() const   { return dry_run; }
 	bool     get_build_all() const { return build_all; }
 	Package  *get_package(const std::string &);
-	Package  *get_default_package() const { return default_pkg; }
+	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; }
@@ -42,12 +45,13 @@ public:
 	std::string get_tool(const std::string &, const std::string &);
 	void     apply_profile_template(Config &, const std::string &) const;
 	void     add_target(Target *);
+	void     problem(const std::string &, const std::string &);
 	int      main();
 	~Builder();
 
 	static void usage(const char *, const char *, bool);
 private:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Builder &, const Msp::Path::Path &);
@@ -55,12 +59,24 @@ private:
 		Builder         &bld;
 		Msp::Path::Path src;
 
+		void architecture(const std::string &, const std::string &);
+		void binpkg(const std::string &);
+		void profile(const std::string &);
 		void package(const std::string &);
 	};
 
+	class ProfileLoader: public Msp::DataFile::Loader
+	{
+	public:
+		ProfileLoader(StringMap &);
+	private:
+		StringMap &profile;
+
+		void option(const std::string &, 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, StringMap>   ToolMap;
 	typedef std::map<std::string, StringMap>   ProfileTemplateMap;
 
@@ -69,8 +85,7 @@ private:
 	Msp::Path::Path cwd;
 
 	PackageMap   packages;
-	PackageList  new_pkgs;
-	Package      *default_pkg;
+	SourcePackage *main_pkg;
 
 	TargetMap    targets;
 	TargetList   new_tgts;
@@ -81,6 +96,7 @@ private:
 	StringMap    archs;    //< arch -> prefix
 	ProfileTemplateMap profile_tmpl;
 
+	ProblemList     problems;
 	Analyzer        *analyzer;
 	bool            build;
 	unsigned        clean;