X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=a2563bf3004d36027a6e5c37611a75dad545bb13;hb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;hp=743a962f52e2750c429c6bd93299208729dde8e0;hpb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;p=builder.git

diff --git a/source/package.h b/source/package.h
index 743a962..a2563bf 100644
--- a/source/package.h
+++ b/source/package.h
@@ -1,82 +1,66 @@
+/* $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/parser/loader.h>
+#include <msp/datafile/loader.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.  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::Loader
 	{
 	public:
 		Loader(Package &);
 		Package &get_object() { return pkg; }
-		~Loader();
-	private:
+	protected:
 		Package &pkg;
-		
+
 		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                create_build_info();
-	void                process_options(const RawOptionMap &);
+	const PackageList   &get_requires() const       { return requires; }
+	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
 
-	static Package *create(Builder &, const std::string &);
-private:
-	enum InstallFlags
-	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
-	};
-	
+	/// Indicates whether or not this package supports pkg-config
+	bool get_use_pkgconfig() const { return use_pkgconfig; }
+
+	void                configure(const StringMap &, unsigned);
+	virtual ~Package() { }
+protected:
 	Builder       &builder;
-	
+
 	std::string   name;
-	std::string   version;
-	std::string   description;
-	
-	bool          buildable;
-	Msp::Path::Path source;
-	PkgRefList    requires;
-	BuildInfo     build_info;
+
+	PackageList   requires;
 	BuildInfo     export_binfo;
-	ComponentList components;
-	Config        config;
-	bool          build_info_ready;
+	bool          conf_done;
 
-	bool          need_path;
-	Msp::Path::Path path;
+	bool          use_pkgconfig;
 
-	Package(Builder &, const std::string &, const std::vector<std::string> &);
-	void    init_buildable();
-	unsigned get_install_flags();
+	Package(Builder &, const std::string &);
+	virtual void do_configure(const StringMap &, unsigned) { }
+	virtual void create_build_info() { }
 };
 
 #endif