Move variable expansion from Config to SourcePackage

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index c7ffce3ca88bf583844a1c3dc7546fbad425b73f..d83cc6eeb182ea525708dd7e4fc933bc5c34e888 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -48,9 +48,11 @@ public:
        enum Type
        {
                HEADERS,
-               PROGRAM,
                LIBRARY,
+               PROGRAM,
                MODULE,
+               DATAFILE,
+               INSTALL,
                TARBALL
        };
 
@@ -58,7 +60,7 @@ protected:
        SourcePackage &pkg;
        Type type;
        std::string name;
-       PathList sources;
+       StringList sources;
        bool install;
        const Component *module_host;
        bool modular;
@@ -71,13 +73,15 @@ public:
        const SourcePackage &get_package() const { return pkg; }
        Type get_type() const { return type; }
        const std::string &get_name() const { return name; }
-       const PathList &get_sources() const { return sources; }
+       const StringList &get_sources() const { return sources; }
        const BuildInfo &get_build_info() const { return build_info; }
        bool get_install() const { return install; }
        bool is_modular() const { return modular; }
        const PackageList &get_requires() const { return requires; }
        bool is_default() const { return deflt; }
 
+       void configure(const StringMap &, unsigned);
+
        /** 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();