X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=60276daff288bb48cc2292bf12e91f5b88d882e2;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=a466089ae75aad13b049d5e5e3660a930f597ec3;hpb=8d7926359d2477a9928d7367678314bcbc1f6e81;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index a466089..60276da 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,10 +1,3 @@
-/* $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>
@@ -76,7 +69,7 @@ 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
@@ -87,7 +80,7 @@ string SourcePackage::expand_string(const string &str) const
 	while((dollar = result.find('$'))!=string::npos)
 	{
 		if(n>1000)
-			throw Exception("Too much variable expansions");
+			throw bad_expansion("nested too deep");
 
 		string::size_type end;
 		string var;
@@ -95,7 +88,7 @@ string SourcePackage::expand_string(const string &str) const
 		{
 			end = result.find('}', dollar+2);
 			if(end==string::npos)
-				throw Exception("Unterminated variable reference");
+				throw bad_expansion("unterminated variable reference");
 			var = result.substr(dollar+2, end-dollar-2);
 			++end;
 		}
@@ -188,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());
@@ -207,23 +198,25 @@ void SourcePackage::create_build_info()
 	string optimize = config.get_option("optimize").value;
 	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();