X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=7036efd7238eea0891a5516a616eacf7619c9fa8;hb=0ac8d6708b8c758fb89d97a0049d4a329990b83b;hp=3e3388dbc4b41043ee0cb0278da362b227bc01d2;hpb=0fd98b61eb112fe397c67b7735627b7bbdd01e41;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 3e3388d..7036efd 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,14 +12,18 @@
 #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 "architecture.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.
@@ -25,71 +36,90 @@ 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_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 &);
+	const Architecture &get_architecture(const std::string &) const;
+	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 &);
 	private:
 		Builder         &bld;
 		Msp::Path::Path src;
-		
+
+		void architecture(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;
-	RawOptionMap cmdline_options;
+	StringMap    cmdline_options;
 	Msp::Path::Path cwd;
-	
+
 	PackageMap   packages;
-	PackageList  new_pkgs;
-	Package      *default_pkg;
+	SourcePackage *main_pkg;
 
 	TargetMap    targets;
 	TargetList   new_tgts;
 	TargetMap    includes;
 	TargetMap    libraries;
 
-	ToolMap      tools;    /// Not used yet
-	StringMap    archs;    //< arch -> prefix
-	
+	ArchMap      archs;
+	ProfileTemplateMap profile_tmpl;
+
+	ProblemList     problems;
 	Analyzer        *analyzer;
-	bool            do_build;
+	bool            build;
+	unsigned        clean;
 	bool            dry_run;
 	bool            help;
 	unsigned        verbose;
-	bool            chrome;
+	bool            show_progress;
 	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 &, 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;
 };