Reorder class members

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 18d1395aa8e7d019a79ac9c090ec727b9fced281..b8750ee393f3d0946818297c58301840edd5f54e 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -33,7 +33,6 @@ public:
                DATA=8
        };
 
-       /// Loads a package from a file.
        class Loader: public Package::Loader
        {
        public:
@@ -50,40 +49,50 @@ public:
                void tar_file(const std::string &);
        };
 
-       SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
-       const std::string   &get_name() const           { return name; }
-       const std::string   &get_version() const        { return version; }
-       const std::string   &get_description() const    { return description; }
-       const Msp::FS::Path &get_source() const       { return source; }
-       Msp::FS::Path     get_temp_dir() const;
-       Msp::FS::Path     get_out_dir() const;
-       const ComponentList &get_components() const     { return components; }
-       const Config        &get_config() const         { return config; }
-       const BuildInfo     &get_build_info() const     { return build_info; }
-       const BuildInfo     &get_exported_binfo() const { return export_binfo; }
-       Builder             &get_builder() const        { return builder; }
-       unsigned            get_install_flags();
-       LibMode             get_library_mode() const;
-       const PathList      &get_tar_files() const      { return tar_files; }
-       DependencyCache     &get_deps_cache() const     { return deps_cache; }
 private:
-       std::string   version;
-       std::string   description;
+       std::string version;
+       std::string description;
 
        Msp::FS::Path source;
-       PackageList   base_reqs;
-       FeatureList   features;
-       BuildInfo     build_info;
+       PackageList base_reqs;
+       FeatureList features;
+       BuildInfo build_info;
        ConditionList conditions;
        ComponentList components;
-       Config        config;
-       bool          conf_done;
+       Config config;
+       bool conf_done;
        mutable DependencyCache deps_cache;
-       PathList      tar_files;
+       PathList tar_files;
+
+public:
+       SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+       const std::string &get_name() const { return name; }
+       const std::string &get_version() const { return version; }
+       const std::string &get_description() const { return description; }
+       const Msp::FS::Path &get_source() const { return source; }
+       Msp::FS::Path get_temp_dir() const;
+       Msp::FS::Path get_out_dir() const;
+       const ComponentList &get_components() const { return components; }
+       const Config &get_config() const { return config; }
+       const BuildInfo &get_build_info() const { return build_info; }
+       const BuildInfo &get_exported_binfo() const { return export_binfo; }
+       Builder &get_builder() const { return builder; }
 
-       //Package(Builder &, const std::string &, const std::vector<std::string> &);
+       /** Returns a bitmask indicating which kinds of things the components of
+       this package install. */
+       unsigned get_install_flags();
+
+       LibMode get_library_mode() const;
+       const PathList &get_tar_files() const { return tar_files; }
+       DependencyCache &get_deps_cache() const { return deps_cache; }
+private:
        virtual void do_configure(const StringMap &, unsigned);
-       void         init_config();
+
+       /** Initializes configuration options. */
+       void init_config();
+
+       /** Fills in build info based on configuration.  All required packages must be
+       configured when this is called. */
        virtual void create_build_info();
 };