X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=36a59638f104506a9bf6adaca70ab0d8b2ddd57f;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=99e5981503eb35ab9780711a092cea30a3701776;hpb=40eb101a642b9ed2e898eec39e0916fa71066b23;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 99e5981..36a5963 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -40,6 +40,39 @@ bool Config::is_option(const string &name) const
 	return options.count(name);
 }
 
+/**
+Selects the last profile used.  If the profile cache file is not present, the
+default profile is assumed.
+*/
+void Config::select_last_profile()
+{
+	ifstream in((source/".profile.cache").str().c_str());
+	if(in)
+	{
+		string profile;
+		in>>profile;
+		set_option("profile", profile);
+	}
+	else
+		set_option("profile", "default");
+
+	load();
+}
+
+/**
+Selects the given profile.  The profile cache file is updated as well.
+*/
+void Config::select_profile(const string &profile)
+{
+	set_option("profile", profile);
+
+	ofstream out((source/".profile.cache").str().c_str());
+	if(out)
+		out<<profile<<'\n';
+
+	load();
+}
+
 /**
 Processes options from the given raw option map.  Nonexistent options are
 ignored.  If any options were changed, the mtime of the configuration is updated
@@ -49,18 +82,13 @@ to the current time.
 
 @return  Whether any option values were changed
 */
-bool Config::process(const RawOptionMap &opts)
+bool Config::update(const RawOptionMap &opts)
 {
 	bool changed=false;
 	for(RawOptionMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
-		OptionMap::iterator j=options.find(i->first);
-		if(j!=options.end())
-		{
-			if(i->second!=j->second.value)
-				changed=true;
-			j->second.value=i->second;
-		}
+		if(set_option(i->first, i->second) && i->first!="profile")
+			changed=true;
 	}
 
 	if(changed)
@@ -69,11 +97,44 @@ bool Config::process(const RawOptionMap &opts)
 	return changed;
 }
 
-/**
-Loads configuration from a file, if it exists.
-*/
-void Config::load(const Path::Path &fn)
+void Config::save() const
+{
+	Path::Path fn=source/".options.cache";
+
+	OptionMap::const_iterator i=options.find("profile");
+	if(i!=options.end())
+		fn=source/(".options."+i->second.value+".cache");
+
+	ofstream out(fn.str().c_str());
+	if(!out) return;
+	
+	for(i=options.begin(); i!=options.end(); ++i)
+		out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
+}
+
+bool Config::set_option(const string &opt, const string &val)
 {
+	bool result=false;
+
+	OptionMap::iterator i=options.find(opt);
+	if(i!=options.end())
+	{
+		if(i->second.value!=val)
+			result=true;
+		i->second.value=val;
+	}
+
+	return result;
+}
+
+void Config::load()
+{
+	Path::Path fn=source/".options.cache";
+
+	OptionMap::iterator i=options.find("profile");
+	if(i!=options.end())
+		fn=source/(".options."+i->second.value+".cache");
+
 	ifstream in(fn.str().c_str());
 	if(!in) return;
 
@@ -86,15 +147,6 @@ void Config::load(const Path::Path &fn)
 	loader.load(parser);
 }
 
-void Config::save(const Path::Path &fn) const
-{
-	ofstream out(fn.str().c_str());
-	if(!out) return;
-	
-	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
-		out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
-}
-
 Config::Option::Option(const string &n, const string &v, const string &d):
 	name(n),
 	defv(v),
@@ -110,7 +162,5 @@ Config::Loader::Loader(Config &c):
 
 void Config::Loader::option(const string &n, const string &v)
 {
-	OptionMap::iterator i=conf.options.find(n);
-	if(i!=conf.options.end())
-		i->second.value=v;
+	conf.set_option(n, v);
 }