Add a way for components to use libraries from the same package

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 292f140a20cd97f79e101dfabb0cbc6dcd820ebd..2e9e534c0ca0973d2638a8902446c926bdfe0b67 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -6,7 +6,6 @@
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
-#include "misc.h"
 #include "package.h"
 
 class SourcePackage;
@@ -29,6 +28,7 @@ public:
                void require(const std::string &);
                void build_info();
                void install_map();
+               void use(const std::string &);
        };
 
        enum Type
@@ -41,43 +41,53 @@ public:
                TARBALL
        };
 
+       typedef std::list<Msp::FS::Path> SourceList;
+       typedef std::list<const Component *> UseList;
+
 protected:
-       SourcePackage &pkg;
+       SourcePackage &package;
        Type type;
        std::string name;
-       StringList sources;
+       SourceList sources;
        bool install;
        BuildInfo build_info;
-       PackageList requires;
+       Package::Requirements requires;
+       UseList uses;
        bool deflt;
        InstallMap install_map;
 
 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; }
+
+       /** Returns a list of sources for the component.  They may refer to
+       directories or individual files. */
+       const SourceList &get_sources() const { return sources; }
+
+protected:
+       /** Returns a list of all source files for the component. */
+       SourceList 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; }
+       const UseList &get_used_components() const { return uses; }
+       bool is_default() const { return deflt; }
 
+       /** 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();
 
-       void create_targets() const;
+       const BuildInfo &get_build_info() const { return build_info; }
 
-protected:
-       /** Returns a list of all source files for the component. */
-       PathList collect_source_files() const;
+       void create_targets() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif