X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=489026329ec4338390badffe13be7b5b6ef08435;hb=ef97eadef58922f45e1ba86a1d009db5ea41dd50;hp=0676dedd94a8e2e486e619a529e1be65679fe5cb;hpb=409a427f912f9c203b102beed0816b53b250931f;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 0676ded..4890263 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <msp/core/maputils.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/time/utils.h>
@@ -21,21 +13,20 @@ using namespace Msp;
 
 Config::Config(SourcePackage &p):
 	package(p),
-	freeze_mtime(false)
+	changed(false)
 { }
 
 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
 {
-	OptionMap::const_iterator i = options.find(name);
-	if(i==options.end())
-		throw KeyError("Unknown option", name);
-
-	return i->second;
+	return get_item(options, name);
 }
 
 bool Config::is_option(const string &name) const
@@ -43,55 +34,22 @@ bool Config::is_option(const string &name) const
 	return options.count(name);
 }
 
-void Config::select_last_profile()
-{
-	try
-	{
-		IO::BufferedFile in((package.get_source()/".profile").str());
-		string profile;
-		in.getline(profile);
-		set_option("profile", profile);
-	}
-	catch(const IO::file_not_found &)
-	{ }
-
-	freeze_mtime = true;
-	package.get_builder().apply_profile_template(*this, get_option("profile").value);
-	freeze_mtime = false;
-
-	load();
-}
-
-void Config::select_profile(const string &profile)
-{
-	set_option("profile", profile);
-
-	if(!package.get_builder().get_dry_run())
-	{
-		IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE);
-		IO::print(out, "%s\n", profile);
-	}
-
-	freeze_mtime = true;
-	package.get_builder().apply_profile_template(*this, profile);
-	freeze_mtime = false;
-
-	load();
-}
-
 bool Config::update(const StringMap &opts)
 {
-	bool changed = false;
+	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 = true;
+			changed_now = true;
 	}
 
-	if(changed && !freeze_mtime)
+	if(changed_now)
+	{
 		mtime = Time::now();
+		changed = true;
+	}
 
-	return changed;
+	return changed_now;
 }
 
 void Config::finish()
@@ -102,15 +60,15 @@ void Config::finish()
 
 void Config::save() const
 {
-	FS::Path fn = package.get_source()/".options";
+	if(!changed)
+		return;
 
-	OptionMap::const_iterator i = options.find("profile");
-	if(i!=options.end())
-		fn = package.get_source()/(".options."+i->second.value);
+	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(i=options.begin(); i!=options.end(); ++i)
+	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
 		IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
 }
 
@@ -122,7 +80,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;
 	}
 
@@ -131,20 +92,20 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-	FS::Path fn = package.get_source()/(".options."+get_option("profile").value);
+	FS::Path fn = package.get_source()/".config";
 
-	try
+	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 = Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+		mtime = stat.get_modify_time();
 
 		DataFile::Parser parser(in, fn.str());
 		Loader loader(*this);
 		loader.load(parser);
 	}
-	catch(const IO::file_not_found &)
-	{ }
 }
 
 
@@ -157,12 +118,15 @@ Config::Option::Option(const string &n, const string &v, const string &d):
 
 
 Config::Loader::Loader(Config &c):
-	conf(c)
+	DataFile::ObjectLoader<Config>(c)
 {
 	add("option", &Loader::option);
 }
 
 void Config::Loader::option(const string &n, const string &v)
 {
-	conf.set_option(n, v);
+	if(obj.options.count(n))
+		obj.set_option(n, v);
+	else
+		obj.pending_options[n] = v;
 }