Reorder Config members

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 0d67fdeb874deaa60c1438f01764bbb1c697bf9c..5da28838f5d5035fe44aa3a51d798bdd26c92097 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -2,7 +2,7 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
@@ -20,17 +20,11 @@ their own.
 class Component
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Component>
        {
-       private:
-               Component &comp;
-               std::string inst_hdr;
-
        public:
                Loader(Component &);
-               Component &get_object() { return comp; }
        private:
-               virtual void finish();
                void source(const std::string &);
                void require(const std::string &);
                void build_info();
@@ -39,7 +33,6 @@ public:
 
        enum Type
        {
-               HEADERS,
                LIBRARY,
                PROGRAM,
                MODULE,
@@ -49,7 +42,7 @@ public:
        };
 
 protected:
-       SourcePackage &pkg;
+       SourcePackage &package;
        Type type;
        std::string name;
        StringList sources;
@@ -61,17 +54,18 @@ protected:
 
 public:
        Component(SourcePackage &, Type, const std::string &);
-       const SourcePackage &get_package() const { return pkg; }
+
+       const SourcePackage &get_package() const { return package; }
        Type get_type() const { return type; }
        const std::string &get_name() const { return name; }
        const StringList &get_sources() const { return sources; }
        const BuildInfo &get_build_info() const { return build_info; }
        bool get_install() const { return install; }
-       const PackageList &get_requires() const { return requires; }
+       const PackageList &get_required_packages() const { return requires; }
        bool is_default() const { return deflt; }
        const InstallMap &get_install_map() const { return install_map; }
 
-       void configure(const StringMap &, unsigned);
+       void prepare();
 
        /** Prepares the build information for building.  Pulls build info from the
        parent and dependency packages, and adds any component-specific flags. */
@@ -84,6 +78,4 @@ protected:
        PathList collect_source_files() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif