X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=14b343d9687227599a865130fa6fbe28dbe596cf;hb=2992094d86385f06bf9c86bb1d35ad8fe857f257;hp=f8ef7451d6c59fed1bd6ac316cd407b86c5d3161;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/package.h b/source/package.h
index f8ef745..14b343d 100644
--- a/source/package.h
+++ b/source/package.h
@@ -1,18 +1,10 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
-#include "packageref.h"
 
 class Builder;
 class Package;
@@ -20,49 +12,58 @@ 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.
+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::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Package>
 	{
 	public:
 		Loader(Package &);
-		Package &get_object() { return pkg; }
-	protected:
-		Package &pkg;
-
+	private:
 		void require(const std::string &);
 	};
 
-	const std::string   &get_name() const           { return name; }
-	Builder             &get_builder() const        { return builder; }
-	const PkgRefList    &get_requires() const       { return requires; }
-	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
+protected:
+	Builder &builder;
+
+	std::string name;
 
-	/// Indicates whether or not this package supports pkg-config
-	bool get_use_pkgconfig() const { return use_pkgconfig; }
+	PackageList requires;
+	BuildInfo export_binfo;
+	bool conf_done;
 
-	virtual void        resolve_refs();
-	void                configure(const StringMap &, unsigned);
+	bool use_pkgconfig;
+
+	Package(Builder &, const std::string &);
+public:
 	virtual ~Package() { }
-protected:
-	Builder       &builder;
 
-	std::string   name;
+	const std::string &get_name() const { return name; }
+	Builder &get_builder() const { return builder; }
+	const PackageList &get_requires() const { return requires; }
 
-	PkgRefList    requires;
-	BuildInfo     export_binfo;
-	bool          conf_done;
+	const BuildInfo &get_exported_binfo() const { return export_binfo; }
 
-	bool          use_pkgconfig;
+	/// Indicates whether or not this package supports pkg-config
+	bool get_use_pkgconfig() const { return use_pkgconfig; }
 
-	Package(Builder &, const std::string &);
+	/** Processes configuration options that were most likely obtained from the
+	command line. */
+	void configure(const StringMap &, unsigned);
+
+	bool is_configured() const { return conf_done; }
+protected:
 	virtual void do_configure(const StringMap &, unsigned) { }
 	virtual void create_build_info() { }
+
+public:
+	virtual void create_targets() { }
+
+	virtual void save_caches() { }
 };
 
 #endif