X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=36e7870683b3bfed9e1474306ee8adde2ce13a84;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=489026329ec4338390badffe13be7b5b6ef08435;hpb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 4890263..36e7870 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -16,60 +16,14 @@ Config::Config(SourcePackage &p):
 	changed(false)
 { }
 
-void Config::add_option(const string &n, const string &v, const string &d)
+const Config::Option &Config::add_option(const Feature &f)
 {
-	Option opt(n, v, d);
-	if(pending_options.count(n))
-		opt.value = pending_options[n];
-	options.insert(OptionMap::value_type(n, opt));
-}
-
-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;
-
-	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);
+	Option opt(f);
+	InputOptions::const_iterator i = pending_options.find(opt.name);
+	if(i!=pending_options.end())
+		opt.value = i->second;
 
-	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(OptionMap::value_type(opt.name, opt)).first->second;
 }
 
 bool Config::set_option(const string &opt, const string &val)
@@ -83,6 +37,7 @@ bool Config::set_option(const string &opt, const string &val)
 		{
 			result = true;
 			changed = true;
+			mtime = Time::now();
 		}
 		i->second.value = val;
 	}
@@ -90,10 +45,19 @@ bool Config::set_option(const string &opt, const string &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)
 	{
@@ -108,13 +72,29 @@ 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", 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);
+
+	changed = false;
+}
+
+
+Config::Option::Option(const Feature &f):
+	Feature(f),
+	value(default_value)
+{
+	name = "with_"+name;
+}
 
 
 Config::Loader::Loader(Config &c):