Save caches before starting the build

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index d7f7351f00d4420eb324cb492abbf388b2732645..3257794671530e119edcc9de67a9f78633d2d0c6 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -6,7 +6,7 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
-#include "misc.h"
+#include "feature.h"
 
 class SourcePackage;
 
@@ -18,24 +18,19 @@ class Config
 {
 public:
        /** A single configuration option. */
-       struct Option
+       struct Option: public Feature
        {
-               std::string name;
-               std::string defv;
-               std::string descr;
                std::string value;
 
-               Option(const std::string &, const std::string &, const std::string &);
+               Option(const Feature &);
        };
 
        typedef std::map<std::string, Option> OptionMap;
+       typedef std::map<std::string, std::string> InputOptions;
 
 private:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Config>
        {
-       private:
-               Config &conf;
-
        public:
                Loader(Config &);
        private:
@@ -44,45 +39,29 @@ private:
 
        SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
-       bool freeze_mtime;
+       mutable bool changed;
 
 public:
        Config(SourcePackage &);
 
-       /** Adds a configuration option with name, default value and description. */
-       void add_option(const std::string &, const std::string &, const std::string &);
-
-       /** Gets a configuration option by name. */
-       const Option &get_option(const std::string &) const;
+       /** Adds a configuration option based on a feature. */
+       const Option &add_option(const Feature &);
 
-       const OptionMap &get_options() const { return options; }
-       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
+       bool set_option(const std::string &, const std::string &);
 
        /** Checks whether an option exists. */
        bool is_option(const std::string &) const;
 
-       /** Selects the last profile used.  If the profile cache file is not
-       present, the default profile is assumed. */
-       void select_last_profile();
-
-       /** Selects a profile.  The profile cache file is updated, unless doing a
-       dry run. */
-       void select_profile(const std::string &);
-
-       /** Processes options from the given raw option map.  Nonexistent options
-       are ignored.  If any options were changed, the mtime of the configuration is
-       updated to the current time.  Return value indicates whether any options
-       were changed. */
-       bool update(const StringMap &);
+       /** Gets a configuration option by name. */
+       const Option &get_option(const std::string &) const;
 
-       /** Expands any variable references in options. */
-       void finish();
+       const OptionMap &get_options() const { return options; }
+       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
 
-       void save() const;
-private:
-       bool set_option(const std::string &, const std::string &);
        void load();
+       void save() const;
 };
 
 #endif