X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ca49976a9c95cddefe6b1e9d0e8fa54618c3e9ef;hb=f7e0a54c49480981a8d9bec064375323fce0aaf1;hp=44faa071512280cec93c9ee8e8348e51c63333a0;hpb=ef97eadef58922f45e1ba86a1d009db5ea41dd50;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 44faa07..ca49976 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -63,50 +63,6 @@ FS::Path SourcePackage::get_out_dir() const
 		return source/arch.get_name()/detail;
 }
 
-string SourcePackage::expand_string(const string &str) const
-{
-	string result = str;
-	string::size_type dollar = 0;
-	unsigned n = 0;
-	while((dollar = result.find('$'))!=string::npos)
-	{
-		if(n>1000)
-			throw bad_expansion("nested too deep");
-
-		string::size_type end;
-		string var;
-		if(dollar+1<result.size() && result[dollar+1]=='{')
-		{
-			end = result.find('}', dollar+2);
-			if(end==string::npos)
-				throw bad_expansion("unterminated variable reference");
-			var = result.substr(dollar+2, end-dollar-2);
-			++end;
-		}
-		else
-		{
-			for(end=dollar+1; (isalnum(result[end]) || result[end]=='_'); ++end) ;
-			var = result.substr(dollar+1, end-dollar-1);
-		}
-
-		string value;
-		if(config.is_option(var))
-			value = config.get_option(var).value;
-		else if(var=="arch")
-			value = builder.get_current_arch().get_name();
-		else if(var=="system")
-			value = builder.get_current_arch().get_system();
-		else if(const char *ptr = getenv(var.c_str()))
-			value = ptr;
-
-		result.replace(dollar, end-dollar, value);
-
-		++n;
-	}
-
-	return result;
-}
-
 void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 {
 	init_config();
@@ -116,8 +72,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 	if(flag && config.update(opts))
 		builder.get_logger().log("configure", format("Configuration of %s changed", name));
 
-	config.finish();
-
 	deps_cache.load();
 
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)