X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=60276daff288bb48cc2292bf12e91f5b88d882e2;hb=dc4b917034c9d3718f07139e2f0f3631a080c6f3;hp=df1677fcce8edc638f8a8eb66cfafe2b6dee7b25;hpb=49ee08bb6f63f6b3a8cdd3b7cf032dea9b2cba8a;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index df1677f..60276da 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <cstdlib>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
@@ -75,7 +69,51 @@ LibMode SourcePackage::get_library_mode() const
 	else if(mode=="none")
 		return DYNAMIC;
 	else
-		throw Exception("Unknown library mode");
+		throw runtime_error("unknown library mode");
+}
+
+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)
@@ -117,11 +155,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 	deps_cache.load();
 
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-	{
-		const PackageList &reqs = i->get_requires();
-		for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-			(*j)->configure(opts, flag&2);
-	}
+		i->configure(opts, flag);
 }
 
 void SourcePackage::init_config()
@@ -147,8 +181,6 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
-	build_info.add(builder.get_current_arch().get_build_info());
-
 	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
 	const StringList &warnings = builder.get_warnings();
 	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
@@ -164,25 +196,27 @@ void SourcePackage::create_build_info()
 		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
 	string optimize = config.get_option("optimize").value;
-	if(lexical_cast<unsigned>(optimize))
+	if(!optimize.empty() && optimize!="0")
 	{
-		build_info.cflags.push_back("-O"+optimize);
-		build_info.ldflags.push_back("-O"+optimize);
+		if(optimize=="s" || optimize=="size")
+			build_info.optimize = -1;
+		else
+			build_info.optimize = lexical_cast<unsigned>(optimize);
 	}
 
 	if(lexical_cast<bool>(config.get_option("debug").value))
 	{
-		build_info.cflags.push_back("-ggdb");
-		build_info.defines.push_back("DEBUG");
+		build_info.debug = true;
+		build_info.defines["DEBUG"] = "1";
 	}
 
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
-			build_info.cflags.push_back("-DWITH_"+toupper(i->name));
+			build_info.defines["WITH_"+toupper(i->name)] = "1";
 
 	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
 		if(i->eval())
-			build_info.add(i->get_build_info());
+			build_info.update_from(i->get_build_info());
 
 	build_info.unique();
 
@@ -274,5 +308,5 @@ void SourcePackage::Loader::tar_file(const string &f)
 	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
 	for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
 		if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
-			const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);
+			const_cast<StringList &>(i->get_sources()).push_back((spkg.source/f).str());
 }