Use ObjectLoaders where appropriate

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 890cad48cb72527a916fac1e3b0dc7bd11bad88e..140cca16f667a40def5f4497b1c772a66df5a6c0 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -2,9 +2,10 @@
 #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"
 #include "misc.h"
 #include "package.h"
 
@@ -19,28 +20,19 @@ 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 modular();
-               void host(const std::string &);
-               void install_headers(const std::string &);
                void build_info();
+               void install_map();
        };
 
        enum Type
        {
-               HEADERS,
                LIBRARY,
                PROGRAM,
                MODULE,
@@ -58,6 +50,7 @@ protected:
        BuildInfo build_info;
        PackageList requires;
        bool deflt;
+       InstallMap install_map;
 
 public:
        Component(SourcePackage &, Type, const std::string &);
@@ -69,6 +62,7 @@ public:
        bool get_install() const { return install; }
        const PackageList &get_requires() const { return requires; }
        bool is_default() const { return deflt; }
+       const InstallMap &get_install_map() const { return install_map; }
 
        void configure(const StringMap &, unsigned);