X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=4c4029ea24f757d97ccc897c4ee73dc124f9349b;hb=64f01c486e48f260a5d895092806ee341ef23198;hp=463357dd32d37d19dd31266bc538f7e288051c46;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 463357d..4c4029e 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,4 +1,6 @@
 #include <algorithm>
+#include <set>
+#include <msp/strings/format.h>
 #include "buildinfo.h"
 
 using namespace std;
@@ -7,23 +9,25 @@ using namespace Msp;
 namespace {
 
 /** Removes any duplicate entries from a list, leaving only the first one.  The
-order of other elements is preserved.  O(n²) efficiency. */
-void unique(StringList &l)
+order of other elements is preserved.  O(nlogn) efficiency. */
+template<typename T>
+void unique(list<T> &l)
 {
-	for(StringList::iterator i=l.begin(); i!=l.end(); ++i)
-		for(StringList::iterator j=i; j!=l.end();)
-		{
-			if(j!=i && *j==*i)
-				j = l.erase(j);
-			else
-				++j;
-		}
+	set<T> seen;
+	for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+	{
+		if(seen.count(*i))
+			l.erase(i++);
+		else
+			seen.insert(*i++);
+	}
 }
 
 }
 
 
 BuildInfo::BuildInfo():
+	libmode(DYNAMIC),
 	threads(false),
 	debug(false),
 	optimize(0),
@@ -44,10 +48,13 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	threads = bi.threads;
 	if(level==LOCAL)
 	{
+		libmode = bi.libmode;
 		debug = bi.debug;
 		optimize = bi.optimize;
 		strip = bi.strip;
 	}
+
+	unique();
 }
 
 void BuildInfo::unique()
@@ -56,14 +63,14 @@ void BuildInfo::unique()
 	::unique(libpath);
 	::unique(libs);
 
-	for(StringList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
+	for(WordList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
 	{
 		bool flag = i->compare(0, 3, "no-");
 
 		string warn = (flag ? *i : i->substr(3));
 		string no_warn = "no-"+warn;
 
-		for(StringList::iterator j=i; j!=warnings.end();)
+		for(WordList::iterator j=i; j!=warnings.end();)
 		{
 			if(j!=i && (*j==warn || *j==no_warn))
 			{
@@ -87,33 +94,49 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	add("incpath",  &Loader::incpath);
 	add("libpath",  &Loader::libpath);
 	add("library",  &Loader::library);
+	add("libmode",  &BuildInfo::libmode);
 	add("optimize", &BuildInfo::optimize);
 	add("strip",    &BuildInfo::strip);
 	add("threads",  &BuildInfo::threads);
 	add("warning",  &Loader::warning);
 }
 
-void BuildInfo::Loader::incpath(const std::string &s)
+void BuildInfo::Loader::incpath(const string &s)
 {
 	obj.incpath.push_back(s);
 }
 
-void BuildInfo::Loader::define(const std::string &d, const std::string &v)
+void BuildInfo::Loader::define(const string &d, const string &v)
 {
 	obj.defines[d] = v;
 }
 
-void BuildInfo::Loader::libpath(const std::string &s)
+void BuildInfo::Loader::libpath(const string &s)
 {
 	obj.libpath.push_back(s);
 }
 
-void BuildInfo::Loader::library(const std::string &s)
+void BuildInfo::Loader::library(const string &s)
 {
 	obj.libs.push_back(s);
 }
 
-void BuildInfo::Loader::warning(const std::string &s)
+void BuildInfo::Loader::warning(const string &s)
 {
 	obj.warnings.push_back(s);
 }
+
+
+void operator>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
+{
+	if(conv.get()=="FORCE_STATIC")
+		libmode = BuildInfo::FORCE_STATIC;
+	else if(conv.get()=="STATIC")
+		libmode = BuildInfo::STATIC;
+	else if(conv.get()=="DYNAMIC")
+		libmode = BuildInfo::DYNAMIC;
+	else if(conv.get()=="FORCE_DYNAMIC")
+		libmode = BuildInfo::FORCE_DYNAMIC;
+	else
+		throw lexical_error(format("Conversion of '%s' to LibraryMode", conv.get()));
+}