Fix recognition of versioned msp package directories

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 292f140a20cd97f79e101dfabb0cbc6dcd820ebd..32cbe0a79ee7edeb04b777ab43201aae9d35faa1 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -42,7 +42,7 @@ public:
        };
 
 protected:
-       SourcePackage &pkg;
+       SourcePackage &package;
        Type type;
        std::string name;
        StringList sources;
@@ -55,29 +55,34 @@ protected:
 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; }
+
+       /** Returns a list of sources for the component.  They may refer to
+       directories or individual files. */
        const StringList &get_sources() const { return sources; }
-       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;
+
+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 PackageList &get_required_packages() const { return requires; }
+       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