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

diff --git a/source/config.cpp b/source/config.cpp
index 99bfeea..0676ded 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,7 +5,6 @@ Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <cstdlib>
 #include <msp/core/except.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -32,7 +31,7 @@ void Config::add_option(const string &n, const string &v, const string &d)
 
 const Config::Option &Config::get_option(const string &name) const
 {
-	OptionMap::const_iterator i=options.find(name);
+	OptionMap::const_iterator i = options.find(name);
 	if(i==options.end())
 		throw KeyError("Unknown option", name);
 
@@ -53,12 +52,12 @@ void Config::select_last_profile()
 		in.getline(profile);
 		set_option("profile", profile);
 	}
-	catch(const IO::FileNotFound &)
+	catch(const IO::file_not_found &)
 	{ }
 
-	freeze_mtime=true;
+	freeze_mtime = true;
 	package.get_builder().apply_profile_template(*this, get_option("profile").value);
-	freeze_mtime=false;
+	freeze_mtime = false;
 
 	load();
 }
@@ -73,82 +72,41 @@ void Config::select_profile(const string &profile)
 		IO::print(out, "%s\n", profile);
 	}
 
-	freeze_mtime=true;
+	freeze_mtime = true;
 	package.get_builder().apply_profile_template(*this, profile);
-	freeze_mtime=false;
+	freeze_mtime = false;
 
 	load();
 }
 
 bool Config::update(const StringMap &opts)
 {
-	bool changed=false;
+	bool changed = 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 = true;
 	}
 
 	if(changed && !freeze_mtime)
-		mtime=Time::now();
+		mtime = Time::now();
 
 	return changed;
 }
 
 void Config::finish()
 {
-	for(unsigned n=0; n<20; ++n)
-	{
-		bool changed=false;
-		for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
-		{
-			Option &opt=i->second;
-			string::size_type dollar=0;
-			while((dollar=opt.value.find('$', dollar))!=string::npos)
-			{
-				string::size_type end;
-				string var;
-				if(opt.value[dollar+1]=='{')
-				{
-					end=opt.value.find('}', dollar+2);
-					if(end==string::npos)
-						throw Exception("Unterminated variable reference");
-					var=opt.value.substr(dollar+2, end-dollar-2);
-					++end;
-				}
-				else
-				{
-					for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end) ;
-					var=opt.value.substr(dollar+1, end-dollar-1);
-				}
-
-				string value;
-				if(is_option(var))
-					value=get_option(var).value;
-				else if(var=="arch")
-					value=package.get_builder().get_current_arch().get_name();
-				else if(const char *ptr=getenv(var.c_str()))
-					value=ptr;
-
-				opt.value.replace(dollar, end-dollar, value);
-
-				dollar+=value.size();
-				changed=true;
-			}
-		}
-
-		if(!changed)
-			break;
-	}
+	for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
+		i->second.value = package.expand_string(i->second.value);
 }
 
 void Config::save() const
 {
-	FS::Path fn=package.get_source()/".options";
+	FS::Path fn = package.get_source()/".options";
 
-	OptionMap::const_iterator i=options.find("profile");
+	OptionMap::const_iterator i = options.find("profile");
 	if(i!=options.end())
-		fn=package.get_source()/(".options."+i->second.value);
+		fn = package.get_source()/(".options."+i->second.value);
 
 	IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
@@ -158,14 +116,14 @@ void Config::save() const
 
 bool Config::set_option(const string &opt, const string &val)
 {
-	bool result=false;
+	bool result = false;
 
-	OptionMap::iterator i=options.find(opt);
+	OptionMap::iterator i = options.find(opt);
 	if(i!=options.end())
 	{
 		if(i->second.value!=val)
-			result=true;
-		i->second.value=val;
+			result = true;
+		i->second.value = val;
 	}
 
 	return result;
@@ -173,19 +131,19 @@ 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()/(".options."+get_option("profile").value);
 
 	try
 	{
 		IO::BufferedFile in(fn.str());
 
-		mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+		mtime = Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
 
 		DataFile::Parser parser(in, fn.str());
 		Loader loader(*this);
 		loader.load(parser);
 	}
-	catch(const IO::FileNotFound &)
+	catch(const IO::file_not_found &)
 	{ }
 }