X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=f0a58b74dc9619ed1a6fe5abfb865e61ab34d9b9;hb=82ae60a647ebb9567f7177c353245f4d72faaf5e;hp=23e376eb89393d12c51ac05840910490c68b054a;hpb=f7e0a54c49480981a8d9bec064375323fce0aaf1;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 23e376e..f0a58b7 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -4,15 +4,16 @@
 #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"
 
 class Builder;
 class BuildType;
+class FileTarget;
 
 class bad_expansion: public std::runtime_error
 {
@@ -27,7 +28,7 @@ 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;
@@ -45,29 +46,41 @@ 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 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;
 	FeatureList features;
 	BuildInfo build_info;
 	ComponentList components;
+	Component *source_tarball;
 	Config config;
-	mutable DependencyCache deps_cache;
+	mutable Cache cache;
 
 public:
 	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+
 	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; }
+	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; }
@@ -76,18 +89,9 @@ public:
 	const BuildInfo &get_build_info() const { return build_info; }
 	Builder &get_builder() const { return builder; }
 
-	DependencyCache &get_deps_cache() const { return deps_cache; }
+	Cache &get_cache() const { return 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();
+	virtual void do_prepare();
 
 	virtual void save_caches();
 };