X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=afa60e87e45f10fe3a0e0c9780e2c52c9a607741;hb=b6dcf65b5e1b99f6c65454358c7610f3e9c8af2b;hp=36a59638f104506a9bf6adaca70ab0d8b2ddd57f;hpb=0fd98b61eb112fe397c67b7735627b7bbdd01e41;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 36a5963..afa60e8 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -2,11 +2,18 @@
 #include <msp/error.h>
 #include <msp/path/utils.h>
 #include <msp/time/utils.h>
+#include "builder.h"
 #include "config.h"
+#include "package.h"
 
 using namespace std;
 using namespace Msp;
 
+Config::Config(Package &p):
+	package(p),
+	freeze_mtime(false)
+{ }
+
 /**
 Adds a configuration option.
 
@@ -46,29 +53,39 @@ default profile is assumed.
 */
 void Config::select_last_profile()
 {
-	ifstream in((source/".profile.cache").str().c_str());
+	ifstream in((package.get_source()/".profile.cache").str().c_str());
 	if(in)
 	{
 		string profile;
-		in>>profile;
+		getline(in, profile);
 		set_option("profile", profile);
 	}
-	else
-		set_option("profile", "default");
+
+	freeze_mtime=true;
+	package.get_builder().apply_profile_template(*this, get_option("profile").value);
+	freeze_mtime=false;
 
 	load();
 }
 
 /**
-Selects the given profile.  The profile cache file is updated as well.
+Selects the given profile.  The profile cache file is updated as well, unless
+--dry-run was given.
 */
 void Config::select_profile(const string &profile)
 {
 	set_option("profile", profile);
 
-	ofstream out((source/".profile.cache").str().c_str());
-	if(out)
-		out<<profile<<'\n';
+	if(!package.get_builder().get_dry_run())
+	{
+		ofstream out((package.get_source()/".profile.cache").str().c_str());
+		if(out)
+			out<<profile<<'\n';
+	}
+
+	freeze_mtime=true;
+	package.get_builder().apply_profile_template(*this, profile);
+	freeze_mtime=false;
 
 	load();
 }
@@ -82,28 +99,76 @@ to the current time.
 
 @return  Whether any option values were changed
 */
-bool Config::update(const RawOptionMap &opts)
+bool Config::update(const StringMap &opts)
 {
 	bool changed=false;
-	for(RawOptionMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+	for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
 		if(set_option(i->first, i->second) && i->first!="profile")
 			changed=true;
 	}
 
-	if(changed)
+	if(changed && !freeze_mtime)
 		mtime=Time::now();
 
 	return changed;
 }
 
+/**
+Expands any variable references in options.
+*/
+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;
+			unsigned dollar=0;
+			while((dollar=opt.value.find('$', dollar))!=string::npos)
+			{
+				unsigned 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
+					value=getenv(var.c_str());
+
+				opt.value.replace(dollar, end-dollar, value);
+
+				dollar+=value.size();
+				changed=true;
+			}
+		}
+
+		if(!changed)
+			break;
+	}
+}
+
 void Config::save() const
 {
-	Path::Path fn=source/".options.cache";
+	Path::Path fn=package.get_source()/".options.cache";
 
 	OptionMap::const_iterator i=options.find("profile");
 	if(i!=options.end())
-		fn=source/(".options."+i->second.value+".cache");
+		fn=package.get_source()/(".options."+i->second.value+".cache");
 
 	ofstream out(fn.str().c_str());
 	if(!out) return;
@@ -129,11 +194,11 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-	Path::Path fn=source/".options.cache";
+	Path::Path fn=package.get_source()/".options.cache";
 
 	OptionMap::iterator i=options.find("profile");
 	if(i!=options.end())
-		fn=source/(".options."+i->second.value+".cache");
+		fn=package.get_source()/(".options."+i->second.value+".cache");
 
 	ifstream in(fn.str().c_str());
 	if(!in) return;
@@ -147,6 +212,7 @@ void Config::load()
 	loader.load(parser);
 }
 
+
 Config::Option::Option(const string &n, const string &v, const string &d):
 	name(n),
 	defv(v),
@@ -154,6 +220,7 @@ Config::Option::Option(const string &n, const string &v, const string &d):
 	value(v)
 { }
 
+
 Config::Loader::Loader(Config &c):
 	conf(c)
 {