X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=01a43a0fb8453c0fbd1eedfae560b745717a9d7c;hb=62106ed7cef9b8ef6f07aaf491f8250f7e8d9398;hp=b9807e34634c1380bcf9ab482a8b193e840b1245;hpb=4f78d9f016482ce1ac7d726852e33e07c090df1b;p=builder.git

diff --git a/source/package.h b/source/package.h
index b9807e3..01a43a0 100644
--- a/source/package.h
+++ b/source/package.h
@@ -3,90 +3,72 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
-#include "component.h"
 #include "config.h"
-#include "packageref.h"
 
 class Builder;
 class Package;
 
-typedef std::list<Package *> PackageList;
-
 /**
-A package is a distributable piece of software.  They consist of one or more
-Components and may depend on other packages.  Packages also have configuration
-to determine where files are installed and which features to include (features
-NYI).
+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:
-	/// Loads a package from a file.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Package>
 	{
 	public:
 		Loader(Package &);
-		Package &get_object() { return pkg; }
 	private:
-		Package &pkg;
-		
+		void if_arch(const std::string &);
 		void require(const std::string &);
-		void program(const std::string &);
-		void library(const std::string &);
-		void headers(const std::string &);
-		void build_info();
 	};
 
-	Package(Builder &, const std::string &, const Msp::Path::Path &);
-	void                set_path(const Msp::Path::Path &);
-	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; }
-	const Config        &get_config() const         { return config; }
-	const PkgRefList    &get_requires() const       { return requires; }
-	const BuildInfo     &get_build_info() const     { return build_info; }
-	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
-	Builder             &get_builder() const        { return builder; }
-	bool                get_need_path() const       { return need_path; }
-	void                resolve_refs();
-	void                configure(const RawOptionMap &, unsigned);
-
-	static Package *create(Builder &, const std::string &);
-private:
-	enum InstallFlags
-	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
-	};
-	
-	Builder       &builder;
-	
-	std::string   name;
-	std::string   version;
-	std::string   description;
-	
-	bool          buildable;
-	Msp::Path::Path source;
-	PkgRefList    requires;
-	PackageList   all_reqs;
-	BuildInfo     build_info;
-	BuildInfo     export_binfo;
-	ComponentList components;
-	Config        config;
-	bool          conf_done;
-
-	bool          need_path;
-	Msp::Path::Path path;
-
-	Package(Builder &, const std::string &, const std::vector<std::string> &);
-	void     init_config();
-	void     create_build_info();
-	unsigned get_install_flags();
+	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