X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=bb3c809642c42f43aee233389b49723bbb5a33ce;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=e107abc273fd1f691ef7d31cc55cfd36d3197d6d;hpb=102de418e552cb1e1f91bb85954c4c101fdea82d;p=builder.git

diff --git a/source/package.h b/source/package.h
index e107abc..bb3c809 100644
--- a/source/package.h
+++ b/source/package.h
@@ -1,16 +1,16 @@
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
-#include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <vector>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
+#include "config.h"
 
 class Builder;
 class Package;
 
-typedef std::list<Package *> PackageList;
-
 /**
 A package is a distributable piece of software.  Package information may be
 obtained in several ways: Build files of source packages, pkg-config for binary
@@ -19,25 +19,26 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
 	{
 	public:
 		Loader(Package &);
-		Package &get_object() { return pkg; }
-	protected:
-		Package &pkg;
-
+	private:
 		void require(const std::string &);
 	};
 
+	using Requirements = std::vector<Package *>;
+
 protected:
 	Builder &builder;
 
 	std::string name;
+	std::string label;
 
-	PackageList requires;
+	Requirements requires;
 	BuildInfo export_binfo;
-	bool conf_done;
+	bool prepared;
+	std::vector<std::string> problems;
 
 	bool use_pkgconfig;
 
@@ -45,26 +46,29 @@ protected:
 public:
 	virtual ~Package() { }
 
-	const std::string &get_name() const { return name; }
 	Builder &get_builder() const { return builder; }
-	const PackageList &get_requires() const { return requires; }
+	const std::string &get_name() const { return name; }
+	const std::string &get_label() const { return label; }
+	const Requirements &get_required_packages() const { return requires; }
 
-	const BuildInfo &get_exported_binfo() const { return export_binfo; }
+	const BuildInfo &get_exported_build_info() const { return export_binfo; }
 
 	/// Indicates whether or not this package supports pkg-config
-	bool get_use_pkgconfig() const { return use_pkgconfig; }
+	bool uses_pkgconfig() const { return use_pkgconfig; }
 
-	/** Processes configuration options that were most likely obtained from the
-	command line. */
-	void configure(const StringMap &, unsigned);
+	/** Prepares the package for building.  Recursively prepares all required
+	packages, populates build info and creates targets. */
+	void prepare();
 
-	bool is_configured() const { return conf_done; }
 protected:
-	virtual void do_configure(const StringMap &, unsigned) { }
-	virtual void create_build_info() { }
+	virtual void do_prepare() { }
 
 public:
-	virtual void create_targets() { }
+	bool is_prepared() const { return prepared; }
+
+	const std::vector<std::string> &get_problems() const { return problems; }
+
+	virtual void save_caches() { }
 };
 
 #endif