Inline simple constructors

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 5f1332fcb40f8a947dc858b0a2ff0cce0f3d1935..7ddd97297f267b96e865b82c5ef3f24b1390aa18 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -5,8 +5,8 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "installmap.h"
-#include "misc.h"
 #include "package.h"
 
 class SourcePackage;
@@ -20,62 +20,68 @@ 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 source(const std::string &);
-               void require(const std::string &);
                void build_info();
                void install_map();
-       };
-
-       enum Type
-       {
-               LIBRARY,
-               PROGRAM,
-               MODULE,
-               DATAFILE,
-               INSTALL,
-               TARBALL
+               void overlay(const std::string &);
+               void require(const std::string &);
+               void source(const std::string &);
        };
 
 protected:
-       SourcePackage &pkg;
-       Type type;
+       SourcePackage &package;
        std::string name;
-       StringList sources;
-       bool install;
+       std::vector<Msp::FS::Path> sources;
+       std::vector<std::string> overlays;
+       bool install = false;
        BuildInfo build_info;
-       PackageList requires;
-       bool deflt;
+       Package::Requirements requires;
+       bool deflt = true;
        InstallMap install_map;
+       std::vector<std::string> problems;
 
+       Component(SourcePackage &p, const std::string &n): package(p), name(n) { }
 public:
-       Component(SourcePackage &, Type, const std::string &);
+       virtual ~Component() { }
 
-       const SourcePackage &get_package() const { return pkg; }
-       Type get_type() const { return type; }
+       const SourcePackage &get_package() const { return package; }
        const std::string &get_name() const { return name; }
-       const StringList &get_sources() const { return sources; }
-       const BuildInfo &get_build_info() const { return build_info; }
+
+       /** Returns a list of sources for the component.  They may refer to
+       directories or individual files. */
+       const std::vector<Msp::FS::Path> &get_sources() const { return sources; }
+
+       const std::vector<std::string> &get_overlays() const { return overlays; }
+
+protected:
+       /** Returns a list of all source files for the component. */
+       std::vector<Msp::FS::Path> collect_source_files() const;
+
+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; }
+       const Package::Requirements &get_required_packages() const { return requires; }
+       bool is_default() const { return deflt; }
+       const std::vector<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();
 
-       void create_targets() const;
+       virtual void update_exported_build_info(BuildInfo &) const { }
 
-protected:
-       /** Returns a list of all source files for the component. */
-       PathList collect_source_files() const;
+       const BuildInfo &get_build_info() const { return build_info; }
+
+       BuildInfo get_build_info_for_path(const Msp::FS::Path &) const;
+
+       virtual void create_targets() const = 0;
 };
 
 #endif