Move conditionals into helper classes

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 3a743d0c41987324ab7da79818cab037059984e4..0e1efad028d5d627b69e6e59f32c5b4d60ce7d34 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -5,6 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "installmap.h"
 #include "package.h"
 
@@ -19,53 +20,38 @@ their own.
 class Component
 {
 public:
-       class Loader: public Msp::DataFile::ObjectLoader<Component>
+       class Loader: public Msp::DataFile::ObjectLoader<Component>, public ConditionalLoader
        {
        public:
                Loader(Component &);
        private:
                void build_info();
-               void if_arch(const std::string &);
-               void if_feature(const std::string &);
                void install_map();
                void overlay(const std::string &);
                void require(const std::string &);
                void source(const std::string &);
-               void use(const std::string &);
-       };
-
-       enum Type
-       {
-               LIBRARY,
-               PROGRAM,
-               MODULE,
-               DATAPACK,
-               INSTALL,
-               TARBALL
        };
 
        typedef std::list<Msp::FS::Path> SourceList;
        typedef std::list<std::string> OverlayList;
-       typedef std::list<const Component *> UseList;
 
 protected:
        SourcePackage &package;
-       Type type;
        std::string name;
        SourceList sources;
        OverlayList overlays;
        bool install;
        BuildInfo build_info;
        Package::Requirements requires;
-       UseList uses;
        bool deflt;
        InstallMap install_map;
+       std::list<std::string> problems;
 
+       Component(SourcePackage &, const std::string &);
 public:
-       Component(SourcePackage &, Type, const std::string &);
+       virtual ~Component() { }
 
        const SourcePackage &get_package() const { return package; }
-       Type get_type() const { return type; }
        const std::string &get_name() const { return name; }
 
        /** Returns a list of sources for the component.  They may refer to
@@ -82,21 +68,23 @@ public:
        bool get_install() const { return install; }
        const InstallMap &get_install_map() const { return install_map; }
        const Package::Requirements &get_required_packages() const { return requires; }
-       const UseList &get_used_components() const { return uses; }
        bool is_default() const { return deflt; }
+       const std::list<std::string> &get_problems() const { return problems; }
 
        /** Prepares any required packages. */
        void prepare();
 
        /** Prepares the build information for building.  Pulls build info from the
        parent and dependency packages, and adds any component-specific flags. */
-       void create_build_info();
+       virtual void create_build_info();
+
+       virtual void update_exported_build_info(BuildInfo &) const { }
 
        const BuildInfo &get_build_info() const { return build_info; }
 
        BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
 
-       void create_targets() const;
+       virtual void create_targets() const = 0;
 };
 
 #endif