X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=f8ef7451d6c59fed1bd6ac316cd407b86c5d3161;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=68e0c224c2116126d29ec620e44fe71a4bab5242;hpb=09325a99816a966bc17a0ec9a0a197efc6ce0349;p=builder.git

diff --git a/source/package.h b/source/package.h
index 68e0c22..f8ef745 100644
--- a/source/package.h
+++ b/source/package.h
@@ -1,12 +1,17 @@
+/* $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;
@@ -17,86 +22,47 @@ 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).
+to determine where files are installed and which features to include.
 */
 class Package
 {
 public:
-	enum InstallFlags
-	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
-	};
-
-	/// Loads a package from a file.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Package &);
 		Package &get_object() { return pkg; }
-	private:
+	protected:
 		Package &pkg;
-		
+
 		void require(const std::string &);
-		void program(const std::string &);
-		void library(const std::string &);
-		void module(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 std::string   &get_version() const        { return version; }
-	const std::string   &get_description() const    { return description; }
-	const Msp::Path::Path &get_source() const       { return source; }
-	Msp::Path::Path     get_temp_dir() const;
-	Msp::Path::Path     get_out_dir() const;
-	Msp::Path::Path     get_prefix() const          { return config.get_option("prefix").value; }
-	const ComponentList &get_components() const     { return components; }
-	bool                get_buildable() const       { return buildable; }
-	const Config        &get_config() const         { return config; }
+	Builder             &get_builder() const        { return builder; }
 	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; }
-	unsigned            get_install_flags();
-	bool                get_use_pkgconfig() const   { return use_pkgconfig; }
-	const std::string   &get_arch() const           { return config.get_option("arch").value; }
-	LibMode             get_library_mode() const;
-	void                resolve_refs();
-	void                configure(const RawOptionMap &, unsigned);
 
-	static Package *create(Builder &, const std::string &);
-private:
+	/// Indicates whether or not this package supports pkg-config
+	bool get_use_pkgconfig() const { return use_pkgconfig; }
+
+	virtual void        resolve_refs();
+	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;
-	PackageList   all_reqs;
-	BuildInfo     build_info;
 	BuildInfo     export_binfo;
-	ComponentList components;
-	Config        config;
 	bool          conf_done;
 
 	bool          use_pkgconfig;
-	bool          need_path;
-	Msp::Path::Path path;
 
-	Package(Builder &, const std::string &, const std::vector<std::string> &);
-	void     init_config();
-	void     create_build_info();
+	Package(Builder &, const std::string &);
+	virtual void do_configure(const StringMap &, unsigned) { }
+	virtual void create_build_info() { }
 };
 
 #endif