X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=e1df73a5b232aefd9c554010b2767f9f7697c297;hb=5d4bc56c55a3928d0a24f18d1ab06f243d39e0a7;hp=a27ddcab28a2ebaa4203b17726a3e702f03d4a97;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/component.h b/source/component.h
index a27ddca..e1df73a 100644
--- a/source/component.h
+++ b/source/component.h
@@ -5,12 +5,21 @@
 #include <msp/parser/loader.h>
 #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:
@@ -20,6 +29,10 @@ public:
 		Component &comp;
 
 		void source(const std::string &);
+		void require(const std::string &);
+		void modular();
+		void host(const std::string &);
+		void build_info();
 	};
 	
 	enum Type
@@ -34,19 +47,25 @@ public:
 	const Package     &get_package() const         { return pkg; }
 	Type              get_type() const             { return type; }
 	const std::string &get_name() const            { return name; }
-	const Msp::Path::Path &get_source() const      { return source; }
+	const PathList    &get_sources() const         { return sources; }
 	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; }
+	void              resolve_refs();
 	void              create_build_info();
 protected:
 	Package     &pkg;
 	Type        type;
 	std::string name;
-	Msp::Path::Path source;
+	PathList    sources;
 	bool        install;
 	std::string install_headers;
+	const Component *module_host;
+	bool        modular;
 	BuildInfo   build_info;
+	PkgRefList  requires;
 };
 typedef std::list<Component> ComponentList;