Trim down the package preparation code

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 0d67fdeb874deaa60c1438f01764bbb1c697bf9c..561a25091381bb4eb5838d1aa0b34b4f9fb89793 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,
@@ -71,7 +64,7 @@ public:
        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. */