X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=5a1eddde5bd1b2793cf9b8e03b90ec9544434725;hb=e4c839cacd8572ade951f4961e8e145d20e0103f;hp=e5c315231f8e77aa084b68bfd78c18867bb1067c;hpb=766dad2d4f7ca73dc182f22e306ba0def6fd8722;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index e5c3152..5a1eddd 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -6,21 +6,16 @@
 #include "buildinfo.h"
 #include "cache.h"
 #include "component.h"
-#include "condition.h"
+#include "conditionalloader.h"
 #include "config.h"
 #include "feature.h"
 #include "package.h"
+#include "toolchain.h"
 
 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,11 +23,10 @@ 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;
-		std::map<std::string, std::string> install_map;
 
 	public:
 		Loader(SourcePackage &);
@@ -41,20 +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 &);
-		void condition(const std::string &);
+		template<typename C, typename A, A>
+		void component_arg(const std::string &);
 		void build_info();
-		void headers(const std::string &);
-		void if_feature(const std::string &);
+		void generate(const std::string &);
 		void interface_version(const std::string &);
-		void source_tarball();
+		void source_archive();
 		void tarball(const std::string &);
-		void tar_file(const std::string &);
 		void version(const std::string &);
 	};
 
-	typedef std::list<Component> ComponentList;
+	typedef std::list<Component *> ComponentList;
 
 private:
 	typedef std::list<Feature> FeatureList;
@@ -66,15 +59,17 @@ private:
 	FileTarget *build_file;
 	Msp::FS::Path source_dir;
 	const BuildType *build_type;
+	Toolchain local_tools;
 	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; }
@@ -85,9 +80,10 @@ public:
 	Msp::FS::Path get_temp_directory() const;
 	Msp::FS::Path get_output_directory() const;
 
-	const ComponentList &get_components() const { return components; }
+	const Toolchain &get_toolchain() const { return local_tools; }
+	const Component &get_component(const std::string &) const;
 	const Config &get_config() const { return config; }
-	bool match_feature(const std::string &) const;
+	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: