X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=e5f6d9d460433a718bf2eca654ff11a92b9e244c;hb=4699c9eb82fb55268976fda87f1f4bf5f7df95a4;hp=cf63b0ecbb8dd1c9960d8563751b966cd31989ea;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index cf63b0e..e5f6d9d 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -12,6 +12,7 @@
 #include "package.h"
 
 class Builder;
+class BuildType;
 
 class bad_expansion: public std::runtime_error
 {
@@ -26,19 +27,13 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-	enum InstallFlags
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
 	{
-		INCLUDE = 1,
-		BIN = 2,
-		LIB = 4,
-		DATA = 8
-	};
+	private:
+		std::map<std::string, std::string> install_map;
 
-	class Loader: public Package::Loader
-	{
 	public:
-		Loader(Package &);
-		SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
+		Loader(SourcePackage &);
 	private:
 		virtual void finish();
 		void feature(const std::string &, const std::string &);
@@ -46,6 +41,7 @@ public:
 		void component(const std::string &);
 		void condition(const std::string &);
 		void build_info();
+		void headers(const std::string &);
 		void tarball(const std::string &);
 		void tar_file(const std::string &);
 	};
@@ -55,6 +51,7 @@ private:
 	std::string description;
 
 	Msp::FS::Path source;
+	const BuildType *build_type;
 	FeatureList features;
 	BuildInfo build_info;
 	ConditionList conditions;
@@ -64,7 +61,6 @@ private:
 
 public:
 	SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
-	const std::string &get_name() const { return name; }
 	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,14 +68,10 @@ public:
 	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; }
-	const BuildInfo &get_exported_binfo() const { return export_binfo; }
 	Builder &get_builder() const { return builder; }
 
-	/** Returns a bitmask indicating which kinds of things the components of
-	this package install. */
-	unsigned get_install_flags();
-
 	LibMode get_library_mode() const;
 	DependencyCache &get_deps_cache() const { return deps_cache; }
 	std::string expand_string(const std::string &) const;
@@ -92,6 +84,10 @@ 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();
+
+	virtual void save_caches();
 };
 
 #endif