X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=34049d0ce9129ec4de87a3f35a367e22c7d72cee;hb=e3407687a61bce56912b89818a9d9f006e9da41f;hp=42c453ad2e0e99200c905dfdd05f62327b22ac54;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/package.h b/source/package.h
index 42c453a..34049d0 100644
--- a/source/package.h
+++ b/source/package.h
@@ -3,61 +3,72 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
-#include "component.h"
+#include "conditionalloader.h"
+#include "config.h"
 
 class Builder;
 class Package;
 
-class PackageRef
-{
-public:
-	PackageRef(Builder &, const std::string &);
-	Package *get_package();
-private:
-	Builder     &builder;
-	std::string name;
-	Package     *package;
-};
-
+/**
+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
+packages and the builderrc file for binary packages with no pkg-config support.
+*/
 class Package
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
 	{
 	public:
 		Loader(Package &);
-		Package &get_object() { return pkg; }
-		~Loader();
 	private:
-		Package &pkg;
-		
 		void require(const std::string &);
-		void program(const std::string &);
-		void library(const std::string &);
 	};
 
-	Package(Builder &, const std::string &, const Msp::Path::Path &);
-	Package(Builder &, const std::string &, const std::list<std::string> &);
-	const std::string   &get_name() const { return name; }
-	const Msp::Path::Path &get_source() const { return source; }
-	const ComponentList &get_components() const { return components; }
-	bool                get_buildable() const { return buildable; }
-	void resolve_refs();
-
-	static Package *create(Builder &, const std::string &);
-private:
-	Builder       &builder;
-	std::string   name;
-	std::string   version;
-	std::string   description;
-	std::list<PackageRef> requires;
-	BuildInfo     build_info;
-	BuildInfo     export_binfo;
-	Msp::Path::Path source;
-	bool          buildable;
-	ComponentList components;
+	typedef std::list<Package *> Requirements;
+
+protected:
+	Builder &builder;
+
+	std::string name;
+	std::string label;
+
+	Requirements requires;
+	BuildInfo export_binfo;
+	bool prepared;
+	std::list<std::string> problems;
+
+	bool use_pkgconfig;
+
+	Package(Builder &, const std::string &);
+public:
+	virtual ~Package() { }
+
+	Builder &get_builder() const { return builder; }
+	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_build_info() const { return export_binfo; }
+
+	/// Indicates whether or not this package supports pkg-config
+	bool uses_pkgconfig() const { return use_pkgconfig; }
+
+	/** Prepares the package for building.  Recursively prepares all required
+	packages, populates build info and creates targets. */
+	void prepare();
+
+protected:
+	virtual void do_prepare() { }
+
+public:
+	bool is_prepared() const { return prepared; }
+
+	const std::list<std::string> &get_problems() const { return problems; }
+
+	virtual void save_caches() { }
 };
 
 #endif