X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=879781df1cb7d989fa2f248b168c4a54f3644a80;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=385468210fc2590b433d6d426075dadc73a98224;hpb=b6dcf65b5e1b99f6c65454358c7610f3e9c8af2b;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 3854682..879781d 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
@@ -5,7 +12,7 @@
 #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"
@@ -14,6 +21,7 @@
 class Analyzer;
 class Config;
 class Package;
+class SourcePackage;
 
 /**
 The main application class.  Controls and owns everything.  Rules the world.
@@ -26,42 +34,57 @@ public:
 	bool     get_dry_run() const   { return dry_run; }
 	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 &, LibMode);
+	SourcePackage *get_default_package() const { return default_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 &);
 	void     apply_profile_template(Config &, const std::string &) const;
+	void     add_target(Target *);
 	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 &);
 	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;
-	
+
 	StringList   cmdline_targets;
 	StringMap    cmdline_options;
 	Msp::Path::Path cwd;
-	
+
 	PackageMap   packages;
 	PackageList  new_pkgs;
-	Package      *default_pkg;
+	SourcePackage *default_pkg;
 
 	TargetMap    targets;
 	TargetList   new_tgts;
@@ -71,9 +94,10 @@ private:
 	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;
@@ -84,16 +108,18 @@ private:
 	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 &, LibMode);
-	void   add_target(Target *);
+	Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
 	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;
 };