X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=64e42259defb93454237f316a817155218ea31d7;hb=3f541fc;hp=9a73880ac887f331e9eae93d0ccbd48892aff7fd;hpb=cbb3c4c6aab7b04f7bd2178fb8f12846d532a472;p=builder.git diff --git a/source/config.h b/source/config.h index 9a73880..64e4225 100644 --- a/source/config.h +++ b/source/config.h @@ -3,16 +3,21 @@ #include #include -#include -#include +#include +#include #include -#include "option.h" +#include "misc.h" -typedef std::map 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: + /** A single configuration option. */ struct Option { std::string name; @@ -22,28 +27,52 @@ public: Option(const std::string &, const std::string &, const std::string &); }; + typedef std::map OptionMap; + typedef std::map 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 &); - void save(const Msp::Path::Path &) const; private: - class Loader: public Msp::Parser::Loader + class Loader: public Msp::DataFile::ObjectLoader { public: Loader(Config &); private: - Config &conf; - void option(const std::string &, const std::string &); }; - + + SourcePackage &package; OptionMap options; + InputOptions pending_options; Msp::Time::TimeStamp mtime; + 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; + + const OptionMap &get_options() const { return options; } + const Msp::Time::TimeStamp &get_mtime() const { return mtime; } + + /** Checks whether an option exists. */ + bool is_option(const std::string &) const; + + /** 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 &); + + /** Expands any variable references in options. */ + void finish(); + + void save() const; + bool set_option(const std::string &, const std::string &); + void load(); }; #endif