Collapse the virtual functions used during package preparation into one

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index e98f4e786f88b9d2fd4e674f1dcf76249e4965ee..8811390601c39ef2aa05b1ed201c7588ec667c34 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -25,6 +25,7 @@ public:
        public:
                Loader(Package &);
        private:
+               void if_arch(const std::string &);
                void require(const std::string &);
        };
 
@@ -45,9 +46,9 @@ public:
 
        const std::string &get_name() const { return name; }
        Builder &get_builder() const { return builder; }
-       const PackageList &get_requires() const { return requires; }
+       const PackageList &get_required_packages() const { return requires; }
 
-       const BuildInfo &get_exported_binfo() const { return export_binfo; }
+       const BuildInfo &get_exported_build_info() const { return export_binfo; }
 
        /// Indicates whether or not this package supports pkg-config
        bool get_use_pkgconfig() const { return use_pkgconfig; }
@@ -56,13 +57,12 @@ public:
        packages, populates build info and creates targets. */
        void prepare();
 
-       bool is_prepared() const { return prepared; }
 protected:
-       virtual void create_build_info() { }
-
-       virtual void create_targets() { }
+       virtual void do_prepare() { }
 
 public:
+       bool is_prepared() const { return prepared; }
+
        virtual void save_caches() { }
 };