X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=8ca9af8dd136dca3812f2f8da9f38fc7c4e0e8f0;hb=fefa7d1e8ac40136b690e305ce9594af95c678b8;hp=114a368ecc96feabec39807621d1dc0d1a363e85;hpb=5c8e939372ae18bef52a2961826f8467d29f12f3;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 114a368..8ca9af8 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,5 +1,4 @@
-#include <algorithm>
-#include <set>
+#include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
 #include "buildinfo.h"
 
@@ -8,18 +7,19 @@ using namespace Msp;
 
 namespace {
 
-/** Removes any duplicate entries from a list, leaving only the first one.  The
-order of other elements is preserved.  O(nlogn) efficiency. */
+/** Removes any duplicate entries from a vector, leaving only the first one.
+The order of other elements is preserved. */
 template<typename T>
-void unique(list<T> &l)
+void unique(vector<T> &v)
 {
-	set<T> seen;
-	for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+	vector<T> seen;
+	for(auto i=v.begin(); i!=v.end(); )
 	{
-		if(seen.count(*i))
-			l.erase(i++);
+		auto j = lower_bound(seen, *i);
+		if(j!=seen.end() && *j==*i)
+			i = v.erase(i);
 		else
-			seen.insert(*i++);
+			seen.insert(j, *i++);
 	}
 }
 
@@ -28,6 +28,7 @@ void unique(list<T> &l)
 
 BuildInfo::BuildInfo():
 	libmode(DYNAMIC),
+	rpath_mode(NO_RPATH),
 	threads(false),
 	debug(false),
 	optimize(0),
@@ -38,7 +39,7 @@ BuildInfo::BuildInfo():
 
 BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
 {
-	LibModeMap::const_iterator i = libmodes.find(lib);
+	auto i = libmodes.find(lib);
 	if(i!=libmodes.end())
 		return i->second;
 	return libmode;
@@ -46,12 +47,24 @@ BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
 
 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;
+	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(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
-		standards[i->first] = i->second;
+
+	for(const auto &kvp: bi.standards)
+	{
+		auto 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)
 	{
@@ -64,8 +77,9 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 		sysroot = bi.sysroot;
 		local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
 		libmode = bi.libmode;
-		for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
-			libmodes[i->first] = i->second;
+		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;
@@ -82,6 +96,21 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 }
 
 
+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);
+}
+
+
 BuildInfo::Loader::Loader(BuildInfo &bi):
 	DataFile::ObjectLoader<BuildInfo>(bi)
 {
@@ -95,6 +124,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	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);
@@ -162,3 +192,16 @@ void operator>>(const 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()));
+}