Code reorganizing and cleanup

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 42c453ad2e0e99200c905dfdd05f62327b22ac54..743a962f52e2750c429c6bd93299208729dde8e0 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -6,20 +6,10 @@
 #include <msp/parser/loader.h>
 #include "buildinfo.h"
 #include "component.h"
+#include "config.h"
+#include "packageref.h"
 
 class Builder;
-class Package;
-
-class PackageRef
-{
-public:
-       PackageRef(Builder &, const std::string &);
-       Package *get_package();
-private:
-       Builder     &builder;
-       std::string name;
-       Package     *package;
-};
 
 class Package
 {
@@ -36,28 +26,57 @@ public:
                void require(const std::string &);
                void program(const std::string &);
                void library(const std::string &);
+               void headers(const std::string &);
+               void build_info();
        };
 
        Package(Builder &, const std::string &, const Msp::Path::Path &);
-       Package(Builder &, const std::string &, const std::list<std::string> &);
-       const std::string   &get_name() const { return name; }
-       const Msp::Path::Path &get_source() const { return source; }
-       const ComponentList &get_components() const { return components; }
-       bool                get_buildable() const { return buildable; }
-       void resolve_refs();
+       void                set_path(const Msp::Path::Path &);
+       const std::string   &get_name() const           { return name; }
+       const Msp::Path::Path &get_source() const       { return source; }
+       const ComponentList &get_components() const     { return components; }
+       bool                get_buildable() const       { return buildable; }
+       const Config        &get_config() const         { return config; }
+       const PkgRefList    &get_requires() const       { return requires; }
+       const BuildInfo     &get_build_info() const     { return build_info; }
+       const BuildInfo     &get_exported_binfo() const { return export_binfo; }
+       Builder             &get_builder() const        { return builder; }
+       bool                get_need_path() const       { return need_path; }
+       void                resolve_refs();
+       void                create_build_info();
+       void                process_options(const RawOptionMap &);
 
        static Package *create(Builder &, const std::string &);
 private:
+       enum InstallFlags
+       {
+               INCLUDE=1,
+               BIN=2,
+               LIB=4,
+               DATA=8
+       };
+       
        Builder       &builder;
+       
        std::string   name;
        std::string   version;
        std::string   description;
-       std::list<PackageRef> requires;
+       
+       bool          buildable;
+       Msp::Path::Path source;
+       PkgRefList    requires;
        BuildInfo     build_info;
        BuildInfo     export_binfo;
-       Msp::Path::Path source;
-       bool          buildable;
        ComponentList components;
+       Config        config;
+       bool          build_info_ready;
+
+       bool          need_path;
+       Msp::Path::Path path;
+
+       Package(Builder &, const std::string &, const std::vector<std::string> &);
+       void    init_buildable();
+       unsigned get_install_flags();
 };
 
 #endif