X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=a518b6302f8fd6cdea0fb4fd4d5e06fd06f991bc;hb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;hp=4ec969ac581d849bcd3cf6cb50bec4ef3654832d;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 4ec969a..a518b63 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,15 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <cstdlib>
-#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>
@@ -32,11 +23,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);
-	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
@@ -46,15 +33,14 @@ bool Config::is_option(const string &name) const
 
 void Config::select_last_profile()
 {
-	try
+	FS::Path profile_cache_fn = package.get_source()/".profile";
+	if(FS::exists(profile_cache_fn))
 	{
-		IO::BufferedFile in((package.get_source()/".profile").str());
+		IO::BufferedFile in(profile_cache_fn.str());
 		string profile;
 		in.getline(profile);
 		set_option("profile", profile);
 	}
-	catch(const IO::FileNotFound &)
-	{ }
 
 	freeze_mtime = true;
 	package.get_builder().apply_profile_template(*this, get_option("profile").value);
@@ -97,49 +83,8 @@ bool Config::update(const StringMap &opts)
 
 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
@@ -175,18 +120,17 @@ void Config::load()
 {
 	FS::Path fn = package.get_source()/(".options."+get_option("profile").value);
 
-	try
+	FS::Stat stat = FS::stat(fn);
+	if(stat)
 	{
 		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::FileNotFound &)
-	{ }
 }