X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=20461fb6187f6f975ef31881f538d1de74b53527;hb=5881b8499dc159564d2f69c3b037e16b4d1af4db;hp=e5f6d9d460433a718bf2eca654ff11a92b9e244c;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index e5f6d9d..20461fb 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -30,11 +30,14 @@ public:
 	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
 	{
 	private:
+		const Config::InputOptions *options;
 		std::map<std::string, std::string> install_map;
 
 	public:
 		Loader(SourcePackage &);
+		Loader(SourcePackage &, const Config::InputOptions &);
 	private:
+		void init(const Config::InputOptions *);
 		virtual void finish();
 		void feature(const std::string &, const std::string &);
 		template<Component::Type>
@@ -42,10 +45,14 @@ public:
 		void condition(const std::string &);
 		void build_info();
 		void headers(const std::string &);
+		void if_arch(const std::string &);
+		void if_feature(const std::string &);
 		void tarball(const std::string &);
 		void tar_file(const std::string &);
 	};
 
+	typedef std::list<Component> ComponentList;
+
 private:
 	std::string version;
 	std::string description;
@@ -54,13 +61,13 @@ private:
 	const BuildType *build_type;
 	FeatureList features;
 	BuildInfo build_info;
-	ConditionList conditions;
 	ComponentList components;
 	Config config;
 	mutable DependencyCache deps_cache;
 
 public:
 	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+
 	const std::string &get_version() const { return version; }
 	const std::string &get_description() const { return description; }
 	const Msp::FS::Path &get_source() const { return source; }
@@ -72,17 +79,8 @@ public:
 	const BuildInfo &get_build_info() const { return build_info; }
 	Builder &get_builder() const { return builder; }
 
-	LibMode get_library_mode() const;
 	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();