X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=fdc5aa2f0bc27dd264edc464815507e51c8771a2;hb=b6dcf65b5e1b99f6c65454358c7610f3e9c8af2b;hp=3d980f26ab19d501adf1486df69a25a6962a8943;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/package.h b/source/package.h
index 3d980f2..fdc5aa2 100644
--- a/source/package.h
+++ b/source/package.h
@@ -10,6 +10,9 @@
 #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
@@ -20,19 +23,27 @@ NYI).
 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
 	{
 	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 &);
+		void module(const std::string &);
 		void headers(const std::string &);
 		void build_info();
 	};
@@ -40,7 +51,12 @@ public:
 	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; }
@@ -49,20 +65,15 @@ public:
 	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                create_build_info();
-	void                process_options(const RawOptionMap &);
+	void                configure(const StringMap &, unsigned);
 
 	static Package *create(Builder &, const std::string &);
 private:
-	enum InstallFlags
-	{
-		INCLUDE=1,
-		BIN=2,
-		LIB=4,
-		DATA=8
-	};
-	
 	Builder       &builder;
 	
 	std::string   name;
@@ -72,18 +83,20 @@ private:
 	bool          buildable;
 	Msp::Path::Path source;
 	PkgRefList    requires;
+	PackageList   all_reqs;
 	BuildInfo     build_info;
 	BuildInfo     export_binfo;
 	ComponentList components;
 	Config        config;
-	bool          build_info_ready;
+	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_buildable();
-	unsigned get_install_flags();
+	void     init_config();
+	void     create_build_info();
 };
 
 #endif