X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=e5057352f0cf86b91787d8af3a7634c389bd6fed;hb=921fc49488a68442fb8794e1a0284a3bf1e7b91b;hp=d0b3cc2aff060c8031ff8111ad3c0725bfcc8ece;hpb=b1a6e6dcdd7e0da272ab0ebbed4e295f83f1165a;p=builder.git

diff --git a/source/component.h b/source/component.h
index d0b3cc2..e505735 100644
--- a/source/component.h
+++ b/source/component.h
@@ -6,12 +6,20 @@
 #include <msp/path/path.h>
 #include "buildinfo.h"
 #include "misc.h"
+#include "packageref.h"
 
 class Package;
 
+/**
+Components specify things to be built.  Each component may build one binary (it
+may also build none), as well as install a bunch of headers.  Components inherit
+dependencies and build info from the package they belong to, and may also add
+their own.
+*/
 class Component
 {
 public:
+	/// Loads a Component from file.  Used from Package::Loader.
 	class Loader: public Msp::Parser::Loader
 	{
 	public:
@@ -21,9 +29,12 @@ public:
 		Component &comp;
 
 		void source(const std::string &);
-		void cflag(const std::string &);
+		void require(const std::string &);
+		void modular();
+		void host(const std::string &);
+		void build_info();
 	};
-	
+
 	enum Type
 	{
 		PROGRAM,
@@ -40,6 +51,10 @@ public:
 	const BuildInfo   &get_build_info() const      { return build_info; }
 	bool              get_install() const          { return install; }
 	const std::string &get_install_headers() const { return install_headers; }
+	bool              get_modular() const          { return modular; }
+	const PkgRefList  &get_requires() const        { return requires; }
+	bool              get_default() const          { return deflt; }
+	void              resolve_refs();
 	void              create_build_info();
 protected:
 	Package     &pkg;
@@ -48,7 +63,11 @@ protected:
 	PathList    sources;
 	bool        install;
 	std::string install_headers;
+	const Component *module_host;
+	bool        modular;
 	BuildInfo   build_info;
+	PkgRefList  requires;
+	bool        deflt;
 };
 typedef std::list<Component> ComponentList;