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 387de4c5814e7bcd907ba5f9ee6b228a9131f0d9..2e9e534c0ca0973d2638a8902446c926bdfe0b67 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -1,19 +1,12 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef COMPONENT_H_
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
-#include "misc.h"
-#include "packageref.h"
+#include "installmap.h"
+#include "package.h"
 
 class SourcePackage;
 
@@ -26,59 +19,75 @@ their own.
 class Component
 {
 public:
-       /// Loads a Component from file.  Used from Package::Loader.
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Component>
        {
        public:
                Loader(Component &);
-               Component &get_object() { return comp; }
        private:
-               Component &comp;
-
                void source(const std::string &);
                void require(const std::string &);
-               void modular();
-               void host(const std::string &);
                void build_info();
+               void install_map();
+               void use(const std::string &);
        };
 
        enum Type
        {
-               PROGRAM,
                LIBRARY,
+               PROGRAM,
                MODULE,
-               HEADERS
+               DATAFILE,
+               INSTALL,
+               TARBALL
        };
 
-       Component(SourcePackage &, Type, const std::string &);
-       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 BuildInfo   &get_build_info() const      { return build_info; }
-       bool              get_install() const          { return install; }
-       const std::string &get_install_headers() const { return install_headers; }
-       bool              get_modular() const          { return modular; }
-       const PkgRefList  &get_requires() const        { return requires; }
-       bool              get_default() const          { return deflt; }
-       void              resolve_refs();
-       void              create_build_info();
-       void              create_targets() const;
+       typedef std::list<Msp::FS::Path> SourceList;
+       typedef std::list<const Component *> UseList;
+
 protected:
-       SourcePackage &pkg;
-       Type        type;
+       SourcePackage &package;
+       Type type;
        std::string name;
-       PathList    sources;
-       bool        install;
-       std::string install_headers;
-       const Component *module_host;
-       bool        modular;
-       BuildInfo   build_info;
-       PkgRefList  requires;
-       bool        deflt;
-
-       PathList    collect_source_files() const;
+       SourceList sources;
+       bool install;
+       BuildInfo build_info;
+       Package::Requirements requires;
+       UseList uses;
+       bool deflt;
+       InstallMap install_map;
+
+public:
+       Component(SourcePackage &, Type, const std::string &);
+
+       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 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 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();
+
+       const BuildInfo &get_build_info() const { return build_info; }
+
+       void create_targets() const;
 };
-typedef std::list<Component> ComponentList;
 
 #endif