X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=5a1eddde5bd1b2793cf9b8e03b90ec9544434725;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=fe79dccc25647470708bc686d6d31dc0374943a8;hpb=02097e6a1ddbffbc2217005c3c2ebba528f5248f;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index fe79dcc..5a1eddd 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,13 +15,7 @@
 class Builder;
 class BuildType;
 class FileTarget;
-
-class bad_expansion: public std::runtime_error
-{
-public:
-	bad_expansion(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_expansion() throw() { }
-};
+class SourceArchiveComponent;
 
 /**
 A package that can be built by Builder.
@@ -28,7 +23,7 @@ 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;
@@ -40,18 +35,19 @@ public:
 		void init(const Config::InputOptions *);
 		virtual void finish();
 		void feature(const std::string &, const std::string &);
-		template<Component::Type>
+		template<typename C>
 		void component(const std::string &);
+		template<typename C, typename A, A>
+		void component_arg(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;
@@ -67,12 +63,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; }
@@ -84,7 +81,7 @@ 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 &);