X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=1e0e5f9cde5b76cff7a5c282e195e9e2dba879fb;hb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;hp=97c9b32eb8ffa233ca980892d704a3c5ea1d8d6b;hpb=7bf0b5d013b88b0408031e2d6594357e71c8138f;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 97c9b32..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"
@@ -28,11 +27,10 @@ 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;
-		std::map<std::string, std::string> install_map;
 
 	public:
 		Loader(SourcePackage &);
@@ -43,19 +41,21 @@ 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_arch(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;
@@ -64,6 +64,7 @@ private:
 	FeatureList features;
 	BuildInfo build_info;
 	ComponentList components;
+	Component *source_tarball;
 	Config config;
 	mutable Cache cache;
 
@@ -71,23 +72,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; }
+private:
+	virtual void do_prepare();
 
+public:
 	Cache &get_cache() const { return cache; }
 private:
-	virtual void create_build_info();
-
-	virtual void create_targets();
-
 	virtual void save_caches();
 };