X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=75ef358f2c2d675150a10fa04cc546e590f6be5c;hb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;hp=b9807e34634c1380bcf9ab482a8b193e840b1245;hpb=4f78d9f016482ce1ac7d726852e33e07c090df1b;p=builder.git

diff --git a/source/package.h b/source/package.h
index b9807e3..75ef358 100644
--- a/source/package.h
+++ b/source/package.h
@@ -6,7 +6,9 @@
 #include <msp/parser/loader.h>
 #include "buildinfo.h"
 #include "component.h"
+#include "condition.h"
 #include "config.h"
+#include "feature.h"
 #include "packageref.h"
 
 class Builder;
@@ -23,6 +25,14 @@ 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
 	{
@@ -33,8 +43,11 @@ public:
 		Package &pkg;
 		
 		void require(const std::string &);
+		void feature(const std::string &, const std::string &);
+		void condition(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();
 	};
@@ -42,7 +55,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; }
@@ -51,19 +69,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                configure(const RawOptionMap &, unsigned);
+	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;
@@ -74,19 +88,21 @@ private:
 	Msp::Path::Path source;
 	PkgRefList    requires;
 	PackageList   all_reqs;
+	FeatureList   features;
 	BuildInfo     build_info;
 	BuildInfo     export_binfo;
+	ConditionList conditions;
 	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();
-	unsigned get_install_flags();
 };
 
 #endif