X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=f59b353d74d0c3edd5dc6e52409e61c9083fab64;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=838ab16ed53d2b1e0c7180d4972827f4c15fce82;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 838ab16..f59b353 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2009  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>
@@ -35,7 +29,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 
 FS::Path SourcePackage::get_temp_dir() const
 {
-	return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
+	string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+	return source/config.get_option("tempdir").value/subdir;
 }
 
 FS::Path SourcePackage::get_out_dir() const
@@ -74,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)
@@ -106,14 +145,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 					requires.push_back(pkg);
 		}
 
-	base_reqs = requires;
-
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-	{
-		const PackageList &reqs = i->get_requires();
-		requires.insert(requires.end(), reqs.begin(), reqs.end());
-	}
-
 	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
@@ -122,6 +153,9 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 	}
 
 	deps_cache.load();
+
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		i->configure(opts, flag);
 }
 
 void SourcePackage::init_config()
@@ -129,10 +163,9 @@ void SourcePackage::init_config()
 	config.add_option("profile",    "default", "Configuration profile");
 	config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
 	config.add_option("outdir",     ".",       "Directory to put build results in");
-	config.add_option("optimize",   "0",       "Apply compiler optimizations");
+	config.add_option("optimize",   "0",       "Compiler optimization level");
 	config.add_option("strip",      "no",      "Strip symbols from programs");
 	config.add_option("debug",      "no",      "Produce debugging symbols");
-	config.add_option("cpu",        "none",    "CPU type to optimize for");
 	config.add_option("staticlibs", "local",   "Use static libraries");
 
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
@@ -148,15 +181,7 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
-	for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i)
-	{
-		const BuildInfo &ebi = (*i)->get_exported_binfo();
-		build_info.add(ebi);
-
-		export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
-		export_binfo.incpath.insert(export_binfo.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
-		export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
-	}
+	build_info.update_from(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();
@@ -173,13 +198,10 @@ 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);
-		string cpu = config.get_option("cpu").value;
-		if(cpu!="none")
-			build_info.cflags.push_back("-march="+cpu);
 	}
 
 	if(lexical_cast<bool>(config.get_option("debug").value))
@@ -194,7 +216,7 @@ void SourcePackage::create_build_info()
 
 	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();
 
@@ -286,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());
 }