X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=fe79dccc25647470708bc686d6d31dc0374943a8;hb=c51411c4b3ed4e6a0d8343b848db3dc736bc7857;hp=f0a58b74dc9619ed1a6fe5abfb865e61ab34d9b9;hpb=e15bd086a1ef924b7986d18a1c5b3d31f54a01de;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index f0a58b7..fe79dcc 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -6,10 +6,10 @@
 #include "buildinfo.h"
 #include "cache.h"
 #include "component.h"
-#include "condition.h"
 #include "config.h"
 #include "feature.h"
 #include "package.h"
+#include "toolchain.h"
 
 class Builder;
 class BuildType;
@@ -32,7 +32,6 @@ public:
 	{
 	private:
 		const Config::InputOptions *options;
-		std::map<std::string, std::string> install_map;
 
 	public:
 		Loader(SourcePackage &);
@@ -43,14 +42,12 @@ public:
 		void feature(const std::string &, const std::string &);
 		template<Component::Type>
 		void component(const std::string &);
-		void condition(const std::string &);
 		void build_info();
-		void headers(const std::string &);
+		void generate(const std::string &);
 		void if_feature(const std::string &);
 		void interface_version(const std::string &);
 		void source_tarball();
 		void tarball(const std::string &);
-		void tar_file(const std::string &);
 		void version(const std::string &);
 	};
 
@@ -66,6 +63,7 @@ private:
 	FileTarget *build_file;
 	Msp::FS::Path source_dir;
 	const BuildType *build_type;
+	Toolchain local_tools;
 	FeatureList features;
 	BuildInfo build_info;
 	ComponentList components;
@@ -79,20 +77,24 @@ public:
 	const std::string &get_version() const { return version; }
 	const std::string &get_interface_version() const { return interface_version; }
 	const std::string &get_description() const { return description; }
+
 	FileTarget &get_build_file() const { return *build_file; }
 	const Msp::FS::Path &get_source_directory() const { return source_dir; }
-	Msp::FS::Path get_temp_dir() const;
-	Msp::FS::Path get_out_dir() const;
+	Msp::FS::Path get_temp_directory() const;
+	Msp::FS::Path get_output_directory() const;
+
+	const Toolchain &get_toolchain() const { return local_tools; }
 	const ComponentList &get_components() const { return components; }
 	const Config &get_config() const { return config; }
+	bool match_feature(const std::string &, const std::string *) const;
 	void set_build_type(const BuildType &);
 	const BuildInfo &get_build_info() const { return build_info; }
-	Builder &get_builder() const { return builder; }
-
-	Cache &get_cache() const { return cache; }
 private:
 	virtual void do_prepare();
 
+public:
+	Cache &get_cache() const { return cache; }
+private:
 	virtual void save_caches();
 };