Refactor package configuration

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 743a962f52e2750c429c6bd93299208729dde8e0..b9807e34634c1380bcf9ab482a8b193e840b1245 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -10,16 +10,25 @@
 #include "packageref.h"
 
 class Builder;
+class Package;
 
+typedef std::list<Package *> PackageList;
+
+/**
+A package is a distributable piece of software.  They consist of one or more
+Components and may depend on other packages.  Packages also have configuration
+to determine where files are installed and which features to include (features
+NYI).
+*/
 class Package
 {
 public:
+       /// Loads a package from a file.
        class Loader: public Msp::Parser::Loader
        {
        public:
                Loader(Package &);
                Package &get_object() { return pkg; }
-               ~Loader();
        private:
                Package &pkg;
                
@@ -43,8 +52,7 @@ public:
        Builder             &get_builder() const        { return builder; }
        bool                get_need_path() const       { return need_path; }
        void                resolve_refs();
-       void                create_build_info();
-       void                process_options(const RawOptionMap &);
+       void                configure(const RawOptionMap &, unsigned);
 
        static Package *create(Builder &, const std::string &);
 private:
@@ -65,17 +73,19 @@ private:
        bool          buildable;
        Msp::Path::Path source;
        PkgRefList    requires;
+       PackageList   all_reqs;
        BuildInfo     build_info;
        BuildInfo     export_binfo;
        ComponentList components;
        Config        config;
-       bool          build_info_ready;
+       bool          conf_done;
 
        bool          need_path;
        Msp::Path::Path path;
 
        Package(Builder &, const std::string &, const std::vector<std::string> &);
-       void    init_buildable();
+       void     init_config();
+       void     create_build_info();
        unsigned get_install_flags();
 };