Code reorganizing and cleanup

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index a1a9859136f7f262543f232391e480e6de2e915e..743a962f52e2750c429c6bd93299208729dde8e0 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -31,18 +31,17 @@ public:
        };
 
        Package(Builder &, const std::string &, const Msp::Path::Path &);
-       Package(Builder &, const std::string &, const std::vector<std::string> &);
        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 std::list<PackageRef> &get_requires() const { return requires; }
-       const BuildInfo     &get_build_info() const { return build_info; }
+       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; }
+       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 &);
@@ -58,21 +57,25 @@ private:
        };
        
        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;
 
-       void init_buildable();
+       Package(Builder &, const std::string &, const std::vector<std::string> &);
+       void    init_buildable();
        unsigned get_install_flags();
 };