Support building modular programs

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index d0b3cc2aff060c8031ff8111ad3c0725bfcc8ece..e1df73a5b232aefd9c554010b2767f9f7697c297 100644 (file)
--- 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,7 +29,10 @@ 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
@@ -40,6 +51,9 @@ 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; }
+       void              resolve_refs();
        void              create_build_info();
 protected:
        Package     &pkg;
@@ -48,7 +62,10 @@ protected:
        PathList    sources;
        bool        install;
        std::string install_headers;
+       const Component *module_host;
+       bool        modular;
        BuildInfo   build_info;
+       PkgRefList  requires;
 };
 typedef std::list<Component> ComponentList;