X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=23e8f36320aaf5de5393bffb9ef5ab3268c7ee06;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=66296001e44229265753f3c52056cef6a2652b02;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 6629600..23e8f36 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,7 +15,7 @@
 class Builder;
 class BuildType;
 class FileTarget;
-class TarballComponent;
+class SourceArchiveComponent;
 
 /**
 A package that can be built by Builder.
@@ -22,36 +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<typename C>
 		void component(const std::string &);
-		template<typename C, typename A, A>
-		void component_arg(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;
-
 private:
-	typedef std::list<Feature> FeatureList;
-
 	std::string version;
 	std::string interface_version;
 	std::string description;
@@ -60,10 +55,10 @@ private:
 	Msp::FS::Path source_dir;
 	const BuildType *build_type;
 	Toolchain local_tools;
-	FeatureList features;
+	std::vector<Feature> features;
 	BuildInfo build_info;
-	ComponentList components;
-	TarballComponent *source_tarball;
+	std::vector<Component *> components;
+	SourceArchiveComponent *source_archive;
 	Config config;
 	mutable Cache cache;
 
@@ -87,12 +82,12 @@ public:
 	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