X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=97c9b32eb8ffa233ca980892d704a3c5ea1d8d6b;hb=1dbeace0c44127bee08a3a8b231f4c8dcf707b2c;hp=d55d373528dc329fc88bf2be82e82d0b6ee59447;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index d55d373..97c9b32 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
 {
@@ -51,23 +52,28 @@ public:
 		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;
 	ComponentList components;
 	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_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,10 +82,8 @@ 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:
-	/** 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();