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

diff --git a/source/package.h b/source/package.h
index 96fb676..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;
@@ -41,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();
 	};
@@ -69,7 +74,7 @@ public:
 	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:
@@ -83,8 +88,10 @@ 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;