X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=b8d19090eed92aa5d653589d14296d50829442b8;hb=c8dfe708b5551818dad3f6cf3e86cc72fe684572;hp=cd576fef26a03cd8c9f4463668e1984670441109;hpb=5c25b76c7263b2a8ac01c863e438592c6287758a;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index cd576fe..b8d1909 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -12,6 +12,8 @@
 #include "package.h"
 
 class Builder;
+class BuildType;
+class FileTarget;
 
 class bad_expansion: public std::runtime_error
 {
@@ -29,11 +31,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>
@@ -41,45 +46,44 @@ 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;
 
-	Msp::FS::Path source;
+	FileTarget *build_file;
+	Msp::FS::Path source_dir;
+	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; }
+	FileTarget &get_build_file() const { return *build_file; }
+	const Msp::FS::Path &get_source_directory() const { return source_dir; }
 	Msp::FS::Path get_temp_dir() const;
 	Msp::FS::Path get_out_dir() const;
 	const ComponentList &get_components() const { return components; }
 	const Config &get_config() const { return config; }
+	void set_build_type(const BuildType &);
 	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;
+	DependencyCache &get_dependency_cache() const { return deps_cache; }
 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();