Rearrange Target members

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 8ba3eb3c899fa4febd920ba9b18bcc2e6920e535..cd576fef26a03cd8c9f4463668e1984670441109 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -26,22 +26,13 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-       enum InstallFlags
-       {
-               INCLUDE = 1,
-               BIN = 2,
-               LIB = 4,
-               DATA = 8
-       };
-
-       class Loader: public Package::Loader
+       class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
        {
        private:
                std::map<std::string, std::string> install_map;
 
        public:
-               Loader(Package &);
-               SourcePackage &get_object() { return static_cast<SourcePackage &>(pkg); }
+               Loader(SourcePackage &);
        private:
                virtual void finish();
                void feature(const std::string &, const std::string &);
@@ -68,7 +59,6 @@ private:
 
 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; }
@@ -77,13 +67,8 @@ public:
        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; }
 
-       /** Returns a bitmask indicating which kinds of things the components of
-       this package install. */
-       unsigned get_install_flags();
-
        LibMode get_library_mode() const;
        DependencyCache &get_deps_cache() const { return deps_cache; }
        std::string expand_string(const std::string &) const;
@@ -98,6 +83,8 @@ private:
        virtual void create_build_info();
 
        virtual void create_targets();
+
+       virtual void save_caches();
 };
 
 #endif