X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=97c8d61a6fb7914494c31475a8423e8954d3d66c;hb=cbc6c684472ee8120f29358c0167d98524f1f939;hp=b8d19090eed92aa5d653589d14296d50829442b8;hpb=edb6076ccae6347acb84868563144a63e6ceba02;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index b8d1909..97c8d61 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -4,10 +4,10 @@
 #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"
 
@@ -28,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;
@@ -46,8 +46,8 @@ 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 source_tarball();
 		void tarball(const std::string &);
 		void tar_file(const std::string &);
 	};
@@ -55,6 +55,8 @@ public:
 	typedef std::list<Component> ComponentList;
 
 private:
+	typedef std::list<Feature> FeatureList;
+
 	std::string version;
 	std::string description;
 
@@ -64,8 +66,9 @@ private:
 	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 &);
@@ -82,11 +85,9 @@ public:
 	const BuildInfo &get_build_info() const { return build_info; }
 	Builder &get_builder() const { return builder; }
 
-	DependencyCache &get_dependency_cache() const { return deps_cache; }
+	Cache &get_cache() const { return cache; }
 private:
-	virtual void create_build_info();
-
-	virtual void create_targets();
+	virtual void do_prepare();
 
 	virtual void save_caches();
 };