X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=1e0e5f9cde5b76cff7a5c282e195e9e2dba879fb;hb=88e3ad4afa2010507227c0c0ffb9d1ce08f61e2a;hp=086690765d691eb5dd124a7def583ebd20db2521;hpb=ac1f35e436dbe86f903dce2f49b002ff17f1ca50;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0866907..1e0e5f9 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -6,7 +6,6 @@
 #include "buildinfo.h"
 #include "cache.h"
 #include "component.h"
-#include "condition.h"
 #include "config.h"
 #include "feature.h"
 #include "package.h"
@@ -32,7 +31,6 @@ public:
 	{
 	private:
 		const Config::InputOptions *options;
-		std::map<std::string, std::string> install_map;
 
 	public:
 		Loader(SourcePackage &);
@@ -43,14 +41,11 @@ 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 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 &);
 	};
 
@@ -79,20 +74,23 @@ 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 ComponentList &get_components() const { return components; }
 	const Config &get_config() const { return config; }
 	bool match_feature(const std::string &) const;
 	void set_build_type(const BuildType &);
 	const BuildInfo &get_build_info() const { return build_info; }
-
-	Cache &get_cache() const { return cache; }
 private:
 	virtual void do_prepare();
 
+public:
+	Cache &get_cache() const { return cache; }
+private:
 	virtual void save_caches();
 };