X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=d7f7351f00d4420eb324cb492abbf388b2732645;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=69094b59777027e5e08056ae6e37408b372feb98;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/config.h b/source/config.h
index 69094b5..d7f7351 100644
--- a/source/config.h
+++ b/source/config.h
@@ -1,21 +1,14 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
 #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 "misc.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Manages configuration for a package.  A configuration may have an arbitary
@@ -24,9 +17,7 @@ amount of options, as well as a modification time (mtime).
 class Config
 {
 public:
-	/**
-	A single configuration option.
-	*/
+	/** A single configuration option. */
 	struct Option
 	{
 		std::string name;
@@ -36,35 +27,60 @@ public:
 
 		Option(const std::string &, const std::string &, const std::string &);
 	};
+
 	typedef std::map<std::string, Option> OptionMap;
 
-	Config(Package &);
-	void add_option(const std::string &, const std::string &, const std::string &);
-	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 is_option(const std::string &) const;
-	void select_last_profile();
-	void select_profile(const std::string &);
-	bool update(const StringMap &);
-	void finish();
-	void save() const;
 private:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
+	private:
+		Config &conf;
+
 	public:
 		Loader(Config &);
 	private:
-		Config &conf;
-		
 		void option(const std::string &, const std::string &);
 	};
 
-	Package         &package;
-	OptionMap       options;
+	SourcePackage &package;
+	OptionMap options;
 	Msp::Time::TimeStamp mtime;
 	bool freeze_mtime;
 
+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;
+
+	/** 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 &);
+
+	/** Expands any variable references in options. */
+	void finish();
+
+	void save() const;
+private:
 	bool set_option(const std::string &, const std::string &);
 	void load();
 };