X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fconfig.cpp;h=194bf0d184f7a2922ee2c172fc49ec480fe7f7d0;hb=af52dd8fd91fd0ef3dcd0faff524b4508c946aef;hp=1ab70c8a8af3431e983b9f6bdc38f9642ba4af24;hpb=d701ca81b781cd061fd60244312b0316cf5bf4d9;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 1ab70c8..194bf0d 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -13,7 +13,6 @@ using namespace Msp;
 
 Config::Config(SourcePackage &p):
 	package(p),
-	freeze_mtime(false),
 	changed(false)
 { }
 
@@ -32,35 +31,6 @@ bool Config::is_option(const string &name) const
 	return options.count(name);
 }
 
-void Config::select_last_profile()
-{
-	FS::Path profile_cache_fn = package.get_source()/".profile";
-	if(FS::exists(profile_cache_fn))
-	{
-		IO::BufferedFile in(profile_cache_fn.str());
-		string profile;
-		in.getline(profile);
-		set_option("profile", profile);
-	}
-
-	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);
-
-	freeze_mtime = true;
-	package.get_builder().apply_profile_template(*this, profile);
-	freeze_mtime = false;
-
-	load();
-}
-
 bool Config::update(const StringMap &opts)
 {
 	bool changed_now = false;
@@ -70,7 +40,7 @@ bool Config::update(const StringMap &opts)
 			changed_now = true;
 	}
 
-	if(changed_now && !freeze_mtime)
+	if(changed_now)
 	{
 		mtime = Time::now();
 		changed = true;
@@ -90,20 +60,11 @@ void Config::save() const
 	if(!changed)
 		return;
 
-	FS::Path fn = package.get_source()/".options";
-
-	OptionMap::const_iterator i = options.find("profile");
-	if(i!=options.end())
-	{
-		fn = package.get_source()/(".options."+i->second.value);
-
-		IO::BufferedFile profile_out((package.get_source()/".profile").str(), IO::M_WRITE);
-		IO::print(profile_out, "%s\n", i->second.value);
-	}
+	FS::Path fn = package.get_source()/".config";
 
 	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);
 }
 
@@ -124,7 +85,7 @@ 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";
 
 	FS::Stat stat = FS::stat(fn);
 	if(stat)