X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=94997750b26497c4ab83003f41382b78b13104fb;hb=373e9bb43c24d38316c5bb0393f4a369563319d3;hp=d7f7351f00d4420eb324cb492abbf388b2732645;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/config.h b/source/config.h
index d7f7351..9499775 100644
--- a/source/config.h
+++ b/source/config.h
@@ -6,7 +6,6 @@
 #include <msp/datafile/loader.h>
 #include <msp/fs/path.h>
 #include <msp/time/timestamp.h>
-#include "misc.h"
 
 class SourcePackage;
 
@@ -21,21 +20,19 @@ public:
 	struct Option
 	{
 		std::string name;
-		std::string defv;
-		std::string descr;
+		std::string default_value;
+		std::string description;
 		std::string value;
 
 		Option(const std::string &, const std::string &, const std::string &);
 	};
 
 	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,8 +41,9 @@ private:
 
 	SourcePackage &package;
 	OptionMap options;
+	InputOptions pending_options;
 	Msp::Time::TimeStamp mtime;
-	bool freeze_mtime;
+	bool changed;
 
 public:
 	Config(SourcePackage &);
@@ -53,36 +51,19 @@ public:
 	/** 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; }
+	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