Save caches before starting the build

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index e5c90de0ce597f5bb14607a0f0b0e49481682202..3257794671530e119edcc9de67a9f78633d2d0c6 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -3,40 +3,65 @@
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
-#include <msp/path/path.h>
+#include <msp/datafile/loader.h>
+#include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
-#include "option.h"
+#include "feature.h"
 
-typedef std::map<std::string, std::string> RawOptionMap;
+class SourcePackage;
 
+/**
+Manages configuration for a package.  A configuration may have an arbitary
+amount of options, as well as a modification time (mtime).
+*/
 class Config
 {
 public:
-       struct Option
+       /** A single configuration 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;
 
-       void add_option(const std::string &, const std::string &, const std::string &);
-       const Option &get_option(const std::string &) const;
-       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
-       bool is_option(const std::string &) const;
-       bool process(const RawOptionMap &);
-       void load(const Msp::Path::Path &); 
 private:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Config>
        {
+       public:
+               Loader(Config &);
+       private:
+               void option(const std::string &, const std::string &);
        };
-       
+
+       SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
+       mutable bool changed;
+
+public:
+       Config(SourcePackage &);
+
+       /** Adds a configuration option based on a feature. */
+       const Option &add_option(const Feature &);
+
+       bool set_option(const std::string &, const std::string &);
+
+       /** Checks whether an option exists. */
+       bool is_option(const std::string &) const;
+
+       /** Gets a configuration option by name. */
+       const Option &get_option(const std::string &) const;
+
+       const OptionMap &get_options() const { return options; }
+       const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
+
+       void load();
+       void save() const;
 };
 
 #endif