X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fconfig.cpp;h=f3110039e79e9c84b8e664e7f560d944a473c921;hb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;hp=194bf0d184f7a2922ee2c172fc49ec480fe7f7d0;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 194bf0d..f311003 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -18,7 +18,10 @@ Config::Config(SourcePackage &p):
 
 void Config::add_option(const string &n, const string &v, const string &d)
 {
-	options.insert(OptionMap::value_type(n, Option(n, v, d)));
+	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
@@ -31,37 +34,14 @@ 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";
+	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)
@@ -76,7 +56,10 @@ bool Config::set_option(const string &opt, const string &val)
 	if(i!=options.end())
 	{
 		if(i->second.value!=val)
+		{
 			result = true;
+			changed = true;
+		}
 		i->second.value = val;
 	}
 
@@ -85,11 +68,11 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-	FS::Path fn = package.get_source()/".config";
-
+	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));
 		IO::BufferedFile in(fn.str());
 
 		mtime = stat.get_modify_time();
@@ -103,8 +86,8 @@ void Config::load()
 
 Config::Option::Option(const string &n, const string &v, const string &d):
 	name(n),
-	defv(v),
-	descr(d),
+	default_value(v),
+	description(d),
 	value(v)
 { }
 
@@ -117,5 +100,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;
 }