X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=48864a9fac64f8fb33d7f4143acac3cb1a27c5ba;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=5b43fe3e68e01aef7521f56610e2b98b134ce289;hpb=4ce2beaa6d1cab7ed8063bbe1472e13a4280ebc0;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 5b43fe3..48864a9 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/maputils.h>
+#include <msp/datafile/writer.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
@@ -12,86 +13,55 @@ using namespace std;
 using namespace Msp;
 
 Config::Config(SourcePackage &p):
-	package(p),
-	changed(false)
+	package(p)
 { }
 
-void Config::add_option(const string &n, const string &v, const string &d)
+const Config::Option &Config::add_option(const Feature &f)
 {
-	options.insert(OptionMap::value_type(n, Option(n, v, d)));
-}
-
-const Config::Option &Config::get_option(const string &name) const
-{
-	return get_item(options, name);
-}
-
-bool Config::is_option(const string &name) const
-{
-	return options.count(name);
-}
-
-bool Config::update(const StringMap &opts)
-{
-	bool changed_now = false;
-	for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
-	{
-		if(set_option(i->first, i->second) && i->first!="profile")
-			changed_now = true;
-	}
-
-	if(changed_now)
-	{
-		mtime = Time::now();
-		changed = true;
-	}
-
-	return changed_now;
-}
-
-void Config::finish()
-{
-	for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
-		i->second.value = package.expand_string(i->second.value);
-}
-
-void Config::save() const
-{
-	if(!changed)
-		return;
+	Option opt(f);
+	auto i = pending_options.find(opt.name);
+	if(i!=pending_options.end())
+		opt.value = i->second;
 
-	FS::Path fn = package.get_source()/".config";
-
-	package.get_builder().get_logger().log("files", format("Writing %s", fn));
-	IO::BufferedFile out(fn.str(), IO::M_WRITE);
-
-	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
-		IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+	return options.insert({ opt.name, opt }).first->second;
 }
 
 bool Config::set_option(const string &opt, const string &val)
 {
 	bool result = false;
 
-	OptionMap::iterator i = options.find(opt);
+	auto i = options.find(opt);
 	if(i!=options.end())
 	{
 		if(i->second.value!=val)
+		{
 			result = true;
+			changed = true;
+			mtime = Time::now();
+		}
 		i->second.value = val;
 	}
 
 	return result;
 }
 
-void Config::load()
+bool Config::is_option(const string &name) const
+{
+	return options.count(name);
+}
+
+const Config::Option &Config::get_option(const string &name) const
 {
-	FS::Path fn = package.get_source()/".config";
+	return get_item(options, name);
+}
 
+void Config::load()
+{
+	FS::Path fn = package.get_source_directory()/".config";
 	FS::Stat stat = FS::stat(fn);
 	if(stat)
 	{
-		package.get_builder().get_logger().log("files", format("Reading %s", fn));
+		package.get_builder().get_logger().log("files", "Reading %s", fn);
 		IO::BufferedFile in(fn.str());
 
 		mtime = stat.get_modify_time();
@@ -102,13 +72,30 @@ void Config::load()
 	}
 }
 
+void Config::save() const
+{
+	if(!changed)
+		return;
 
-Config::Option::Option(const string &n, const string &v, const string &d):
-	name(n),
-	defv(v),
-	descr(d),
-	value(v)
-{ }
+	FS::Path fn = package.get_source_directory()/".config";
+
+	package.get_builder().get_logger().log("files", "Writing %s", fn);
+	IO::BufferedFile out(fn.str(), IO::M_WRITE);
+	DataFile::Writer writer(out);
+
+	for(const auto &kvp: options)
+		writer.write((DataFile::Statement("option"), kvp.second.name, kvp.second.value));
+
+	changed = false;
+}
+
+
+Config::Option::Option(const Feature &f):
+	Feature(f),
+	value(default_value)
+{
+	name = "with_"+name;
+}
 
 
 Config::Loader::Loader(Config &c):
@@ -119,5 +106,8 @@ Config::Loader::Loader(Config &c):
 
 void Config::Loader::option(const string &n, const string &v)
 {
-	obj.set_option(n, v);
+	if(obj.options.count(n))
+		obj.set_option(n, v);
+	else
+		obj.pending_options[n] = v;
 }