X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=e5c315231f8e77aa084b68bfd78c18867bb1067c;hb=d9028dec3b81c84560c580008fa68490f049e723;hp=0aab392308d089c2621ee0515819ea2c540a870f;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0aab392..e5c3152 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -28,7 +28,7 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>
 	{
 	private:
 		const Config::InputOptions *options;
@@ -47,9 +47,11 @@ public:
 		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 &);
 	};
 
 	typedef std::list<Component> ComponentList;
@@ -58,6 +60,7 @@ private:
 	typedef std::list<Feature> FeatureList;
 
 	std::string version;
+	std::string interface_version;
 	std::string description;
 
 	FileTarget *build_file;
@@ -74,21 +77,25 @@ public:
 	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
 
 	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; }
-	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();
 };