Externalize dry run handling from Config and DependencyCache

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 4620cf475f51d3d99b5d251b274a760a92a4fb97..14b343d9687227599a865130fa6fbe28dbe596cf 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
 
 class Builder;
@@ -26,42 +19,51 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Package>
        {
        public:
                Loader(Package &);
-               Package &get_object() { return pkg; }
-       protected:
-               Package &pkg;
-
+       private:
                void require(const std::string &);
        };
 
-       const std::string   &get_name() const           { return name; }
-       Builder             &get_builder() const        { return builder; }
-       const PackageList   &get_requires() const       { return requires; }
-       PackageList         collect_requires();
-       const BuildInfo     &get_exported_binfo() const { return export_binfo; }
+protected:
+       Builder &builder;
+
+       std::string name;
 
-       /// Indicates whether or not this package supports pkg-config
-       bool get_use_pkgconfig() const { return use_pkgconfig; }
+       PackageList requires;
+       BuildInfo export_binfo;
+       bool conf_done;
 
-       void                configure(const StringMap &, unsigned);
+       bool use_pkgconfig;
+
+       Package(Builder &, const std::string &);
+public:
        virtual ~Package() { }
-protected:
-       Builder       &builder;
 
-       std::string   name;
+       const std::string &get_name() const { return name; }
+       Builder &get_builder() const { return builder; }
+       const PackageList &get_requires() const { return requires; }
 
-       PackageList   requires;
-       BuildInfo     export_binfo;
-       bool          conf_done;
+       const BuildInfo &get_exported_binfo() const { return export_binfo; }
 
-       bool          use_pkgconfig;
+       /// Indicates whether or not this package supports pkg-config
+       bool get_use_pkgconfig() const { return use_pkgconfig; }
 
-       Package(Builder &, const std::string &);
+       /** Processes configuration options that were most likely obtained from the
+       command line. */
+       void configure(const StringMap &, unsigned);
+
+       bool is_configured() const { return conf_done; }
+protected:
        virtual void do_configure(const StringMap &, unsigned) { }
        virtual void create_build_info() { }
+
+public:
+       virtual void create_targets() { }
+
+       virtual void save_caches() { }
 };
 
 #endif