X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=48b4832bba1139e8209651fa37b97ec5d02a31d9;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=b7f9c5cc0c9f8cdc54d21d574892adf37c419aad;hpb=6ed04f66e56958890c2ecca82fa3885f10f8adf0;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index b7f9c5c..48b4832 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <set>
+#include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
 #include "buildinfo.h"
 
@@ -14,7 +14,7 @@ template<typename T>
 void unique(list<T> &l)
 {
 	set<T> seen;
-	for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+	for(auto i=l.begin(); i!=l.end(); )
 	{
 		if(seen.count(*i))
 			l.erase(i++);
@@ -28,6 +28,7 @@ void unique(list<T> &l)
 
 BuildInfo::BuildInfo():
 	libmode(DYNAMIC),
+	rpath_mode(NO_RPATH),
 	threads(false),
 	debug(false),
 	optimize(0),
@@ -36,20 +37,50 @@ BuildInfo::BuildInfo():
 	fatal_warnings(false)
 { }
 
+BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
+{
+	LibModeMap::const_iterator i = libmodes.find(lib);
+	if(i!=libmodes.end())
+		return i->second;
+	return libmode;
+}
+
 void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
-	for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
-		defines[i->first] = i->second;
-	incpath.insert(incpath.end(), bi.incpath.begin(), bi.incpath.end());
+	for(const auto &kvp: bi.defines)
+		defines[kvp.first] = kvp.second;
+	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
+	threads = bi.threads;
+
+	for(const auto &kvp: bi.standards)
+	{
+		StandardMap::iterator j = standards.find(kvp.first);
+		if(j==standards.end())
+			standards.insert(kvp);
+		else if(kvp.second.type!=j->second.type || kvp.second.year!=j->second.year)
+		{
+			if(!kvp.second.type.compare(0, 3, "gnu"))
+				j->second.type = kvp.second.type;
+			if(kvp.second.year>j->second.year)
+				j->second.year = kvp.second.year;
+		}
+	}
+
 	if(level!=CHAINED)
 	{
-		libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-		libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+		libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
+		libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
 	}
-	threads = bi.threads;
+
 	if(level==LOCAL)
 	{
+		sysroot = bi.sysroot;
+		local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
 		libmode = bi.libmode;
+		rpath_mode = bi.rpath_mode;
+		for(const auto &kvp: bi.libmodes)
+			libmodes[kvp.first] = kvp.second;
+		keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
 		debug = bi.debug;
 		optimize = bi.optimize;
 		strip = bi.strip;
@@ -58,8 +89,25 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	}
 
 	unique(incpath);
+	unique(local_incpath);
 	unique(libpath);
 	unique(libs);
+	unique(keep_symbols);
+}
+
+
+BuildInfo::LanguageStandard::LanguageStandard(const string &std)
+{
+	auto i = find_if(std, [](char c){ return isdigit(static_cast<unsigned char>(c)); });
+	string::size_type num = i-std.begin();
+	type = std.substr(0, num);
+	year = lexical_cast<unsigned>(std.substr(num));
+	year += (year<70 ? 2000 : 1900);
+}
+
+string BuildInfo::LanguageStandard::str() const
+{
+	return format("%s%02d", type, year%100);
 }
 
 
@@ -69,11 +117,17 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	add("debug",    &BuildInfo::debug);
 	add("define",   &Loader::define);
 	add("incpath",  &Loader::incpath);
+	add("keep_symbol", &Loader::keep_symbol);
 	add("libpath",  &Loader::libpath);
 	add("library",  &Loader::library);
 	add("libmode",  &BuildInfo::libmode);
+	add("libmode",  &Loader::libmode_for_lib);
+	add("local_incpath", &Loader::local_incpath);
 	add("optimize", &BuildInfo::optimize);
+	add("runtime_path_mode", &BuildInfo::rpath_mode);
+	add("standard", &Loader::standard);
 	add("strip",    &BuildInfo::strip);
+	add("sysroot",  &Loader::sysroot);
 	add("threads",  &BuildInfo::threads);
 	add("warning_level", &BuildInfo::warning_level);
 	add("fatal_warnings", &BuildInfo::fatal_warnings);
@@ -89,6 +143,16 @@ void BuildInfo::Loader::define(const string &d, const string &v)
 	obj.defines[d] = v;
 }
 
+void BuildInfo::Loader::keep_symbol(const string &s)
+{
+	obj.keep_symbols.push_back(s);
+}
+
+void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
+{
+	obj.libmodes[l] = m;
+}
+
 void BuildInfo::Loader::libpath(const string &s)
 {
 	obj.libpath.push_back(s);
@@ -99,8 +163,23 @@ void BuildInfo::Loader::library(const string &s)
 	obj.libs.push_back(s);
 }
 
+void BuildInfo::Loader::local_incpath(const string &s)
+{
+	obj.local_incpath.push_back(s);
+}
+
+void BuildInfo::Loader::standard(DataFile::Symbol tag, const string &std)
+{
+	obj.standards[tag.name] = std;
+}
+
+void BuildInfo::Loader::sysroot(const string &s)
+{
+	obj.sysroot = s;
+}
 
-void operator>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
+
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
 	if(conv.get()=="FORCE_STATIC")
 		libmode = BuildInfo::FORCE_STATIC;
@@ -113,3 +192,16 @@ void operator>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 	else
 		throw lexical_error(format("Conversion of '%s' to LibraryMode", conv.get()));
 }
+
+
+void operator>>(const LexicalConverter &conv, BuildInfo::RuntimePathMode &rpath_mode)
+{
+	if(conv.get()=="NONE")
+		rpath_mode = BuildInfo::NO_RPATH;
+	else if(conv.get()=="RELATIVE")
+		rpath_mode = BuildInfo::RELATIVE;
+	else if(conv.get()=="ABSOLUTE")
+		rpath_mode = BuildInfo::ABSOLUTE;
+	else
+		throw lexical_error(format("Conversion of '%s' to RuntimePathMode", conv.get()));
+}