X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=fce58a659fdd925f5b18411ff06035890d6797ca;hb=1ec533a7777be4dce9c8b6bbb1cbc32d38098ae4;hp=3d868631871591d88e2f511007c3d15c06c60202;hpb=aeb23448b5035f4ceb662c487913618d0efff888;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 3d86863..fce58a6 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -6,6 +6,7 @@
 #include "buildinfo.h"
 #include "cache.h"
 #include "component.h"
+#include "conditionalloader.h"
 #include "config.h"
 #include "feature.h"
 #include "package.h"
@@ -14,6 +15,7 @@
 class Builder;
 class BuildType;
 class FileTarget;
+class SourceArchiveComponent;
 
 /**
 A package that can be built by Builder.
@@ -21,30 +23,30 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>, public FeatureConditional
 	{
 	private:
 		const Config::InputOptions *options;
 
 	public:
-		Loader(SourcePackage &);
-		Loader(SourcePackage &, const Config::InputOptions &);
+		Loader(SourcePackage &, const Config::InputOptions *);
 	private:
-		void init(const Config::InputOptions *);
-		virtual void finish();
+		void finish() override;
+
 		void feature(const std::string &, const std::string &);
-		template<Component::Type>
+		template<typename C>
 		void component(const std::string &);
+		template<typename C, typename A>
+		void component_arg(A, const std::string &);
 		void build_info();
 		void generate(const std::string &);
-		void if_feature(const std::string &);
 		void interface_version(const std::string &);
-		void source_tarball();
+		void source_archive();
 		void tarball(const std::string &);
 		void version(const std::string &);
 	};
 
-	typedef std::list<Component> ComponentList;
+	typedef std::list<Component *> ComponentList;
 
 private:
 	typedef std::list<Feature> FeatureList;
@@ -60,12 +62,13 @@ private:
 	FeatureList features;
 	BuildInfo build_info;
 	ComponentList components;
-	Component *source_tarball;
+	SourceArchiveComponent *source_archive;
 	Config config;
 	mutable Cache cache;
 
 public:
 	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+	~SourcePackage();
 
 	const std::string &get_version() const { return version; }
 	const std::string &get_interface_version() const { return interface_version; }
@@ -77,18 +80,18 @@ public:
 	Msp::FS::Path get_output_directory() const;
 
 	const Toolchain &get_toolchain() const { return local_tools; }
-	const ComponentList &get_components() const { return components; }
+	const Component &get_component(const std::string &) const;
 	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; }
 private:
-	virtual void do_prepare();
+	void do_prepare() override;
 
 public:
 	Cache &get_cache() const { return cache; }
 private:
-	virtual void save_caches();
+	void save_caches() override;
 };
 
 #endif