X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fsourcepackage.h;h=086690765d691eb5dd124a7def583ebd20db2521;hb=c45cc6fd2b13513909d43b5f95370b00c8b4c25e;hp=2f6a9a11e79c1632f3107c59eb6f62d58d983066;hpb=70dc2ce96bd3ba878b60cbb61b2bcc1c5c570485;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 2f6a9a1..0866907 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,15 +47,20 @@ 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;
 
 private:
+	typedef std::list<Feature> FeatureList;
+
 	std::string version;
+	std::string interface_version;
 	std::string description;
 
 	FileTarget *build_file;
@@ -72,6 +77,7 @@ 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; }
@@ -79,15 +85,13 @@ public:
 	Msp::FS::Path get_out_dir() 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 create_build_info();
-
-	virtual void create_targets();
+	virtual void do_prepare();
 
 	virtual void save_caches();
 };