Change component order so that miscellaneous installed files get in tarball

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 36cd83e8a800795569c5d3a05d26c330677d37ec..3a358ce04f36b0770cea5251997d62d6d0ae2b8f 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -10,12 +10,12 @@ Distributed under the LGPL
 
 #include <string>
 #include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "misc.h"
-#include "packageref.h"
+#include "package.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Components specify things to be built.  Each component may build one binary (it
@@ -26,59 +26,71 @@ their own.
 class Component
 {
 public:
-       /// Loads a Component from file.  Used from Package::Loader.
        class Loader: public Msp::DataFile::Loader
        {
+       private:
+               Component &comp;
+               std::string inst_hdr;
+
        public:
                Loader(Component &);
                Component &get_object() { return comp; }
        private:
-               Component &comp;
-
+               virtual void finish();
                void source(const std::string &);
                void require(const std::string &);
                void modular();
                void host(const std::string &);
+               void install_headers(const std::string &);
                void build_info();
        };
 
        enum Type
        {
-               PROGRAM,
+               HEADERS,
                LIBRARY,
+               PROGRAM,
                MODULE,
-               HEADERS
+               DATAFILE,
+               INSTALL,
+               TARBALL
        };
 
-       Component(Package &, Type, const std::string &);
-       const Package     &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;
 protected:
-       Package     &pkg;
-       Type        type;
+       SourcePackage &pkg;
+       Type type;
        std::string name;
-       PathList    sources;
-       bool        install;
-       std::string install_headers;
+       PathList sources;
+       bool install;
        const Component *module_host;
-       bool        modular;
-       BuildInfo   build_info;
-       PkgRefList  requires;
-       bool        deflt;
+       bool modular;
+       BuildInfo build_info;
+       PackageList requires;
+       bool deflt;
 
-       PathList    collect_source_files() const;
+public:
+       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; }
+       bool is_modular() const { return modular; }
+       const PackageList &get_requires() const { return requires; }
+       bool is_default() const { return deflt; }
+
+       /** 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;
+
+protected:
+       /** Returns a list of all source files for the component. */
+       PathList collect_source_files() const;
 };
+
 typedef std::list<Component> ComponentList;
 
 #endif