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

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 9327f17..6629600 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -4,22 +4,17 @@
 #include <stdexcept>
 #include <string>
 #include "buildinfo.h"
+#include "cache.h"
 #include "component.h"
-#include "condition.h"
 #include "config.h"
-#include "dependencycache.h"
 #include "feature.h"
 #include "package.h"
+#include "toolchain.h"
 
 class Builder;
 class BuildType;
-
-class bad_expansion: public std::runtime_error
-{
-public:
-	bad_expansion(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_expansion() throw() { }
-};
+class FileTarget;
+class TarballComponent;
 
 /**
 A package that can be built by Builder.
@@ -27,11 +22,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 &);
@@ -40,56 +34,64 @@ 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_arch(const std::string &);
+		void generate(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;
 
-	Msp::FS::Path source;
+	FileTarget *build_file;
+	Msp::FS::Path source_dir;
 	const BuildType *build_type;
+	Toolchain local_tools;
 	FeatureList features;
 	BuildInfo build_info;
 	ComponentList components;
+	TarballComponent *source_tarball;
 	Config config;
-	mutable DependencyCache deps_cache;
+	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; }
 	const std::string &get_description() const { return description; }
-	const Msp::FS::Path &get_source() const { return source; }
-	Msp::FS::Path get_temp_dir() const;
-	Msp::FS::Path get_out_dir() const;
-	const ComponentList &get_components() const { return components; }
+
+	FileTarget &get_build_file() const { return *build_file; }
+	const Msp::FS::Path &get_source_directory() const { return source_dir; }
+	Msp::FS::Path get_temp_directory() const;
+	Msp::FS::Path get_output_directory() const;
+
+	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 std::string *) const;
 	void set_build_type(const BuildType &);
 	const BuildInfo &get_build_info() const { return build_info; }
-	Builder &get_builder() const { return builder; }
-
-	DependencyCache &get_deps_cache() const { return deps_cache; }
-	std::string expand_string(const std::string &) const;
 private:
-	virtual void do_configure(const StringMap &, unsigned);
-
-	/** Initializes configuration options. */
-	void init_config();
-
-	/** Fills in build info based on configuration.  All required packages must be
-	configured when this is called. */
-	virtual void create_build_info();
-
-	virtual void create_targets();
+	virtual void do_prepare();
 
+public:
+	Cache &get_cache() const { return cache; }
+private:
 	virtual void save_caches();
 };