X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=a93c29df632202b878ede76dd1f2d9ba4c1b36f5;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=340fd9660bbdfd6333d9eb219df6389ff545108f;hpb=683301f94f4a3c5b7e2a7f21087f4185b07c4858;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 340fd96..a93c29d 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,46 +1,123 @@
-#include <msp/algo.h>
+#include <algorithm>
+#include <set>
 #include "buildinfo.h"
 
+using namespace std;
 using namespace Msp;
 
-void BuildInfo::add(const BuildInfo &bi)
+namespace {
+
+/** Removes any duplicate entries from a list, leaving only the first one.  The
+order of other elements is preserved.  O(nlogn) efficiency. */
+template<typename T>
+void unique(list<T> &l)
 {
-	cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
-	defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
+	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():
+	threads(false),
+	debug(false),
+	optimize(0),
+	strip(false)
+{ }
+
+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());
-	ldflags.insert(ldflags.end(), bi.ldflags.begin(), bi.ldflags.end());
-	libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-	libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+	if(level!=CHAINED)
+	{
+		libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
+		libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+	}
+	warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
+	threads = bi.threads;
+	if(level==LOCAL)
+	{
+		debug = bi.debug;
+		optimize = bi.optimize;
+		strip = bi.strip;
+	}
+
+	unique();
 }
 
 void BuildInfo::unique()
 {
-	unique(cflags);
-	unique(defines);
-	unique(incpath);
-	unique(ldflags);
-	unique(libpath);
-	unique(libs);
+	::unique(incpath);
+	::unique(libpath);
+	::unique(libs);
+
+	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(WordList::iterator j=i; j!=warnings.end();)
+		{
+			if(j!=i && (*j==warn || *j==no_warn))
+			{
+				flag = (*j==warn);
+				j = warnings.erase(j);
+			}
+			else
+				++j;
+		}
+
+		*i = (flag ? warn : no_warn);
+	}
+}
+
+
+BuildInfo::Loader::Loader(BuildInfo &bi):
+	DataFile::ObjectLoader<BuildInfo>(bi)
+{
+	add("debug",    &BuildInfo::debug);
+	add("define",   &Loader::define);
+	add("incpath",  &Loader::incpath);
+	add("libpath",  &Loader::libpath);
+	add("library",  &Loader::library);
+	add("optimize", &BuildInfo::optimize);
+	add("strip",    &BuildInfo::strip);
+	add("threads",  &BuildInfo::threads);
+	add("warning",  &Loader::warning);
 }
 
-void BuildInfo::unique(InfoList &l)
+void BuildInfo::Loader::incpath(const string &s)
 {
-	InfoList l2;
-	for(InfoList::iterator i=l.begin(); i!=l.end(); ++i)
-		if(!contains(l2, *i))
-			l2.push_back(*i);
-	swap(l, l2);
+	obj.incpath.push_back(s);
 }
 
-BuildInfo::Loader::Loader(BuildInfo &bi):
-	binfo(bi)
+void BuildInfo::Loader::define(const string &d, const string &v)
 {
-	add("cflag",   &Loader::cflag);
-	add("incpath", &Loader::incpath);
-	add("define",  &Loader::define);
-	add("ldflag",  &Loader::ldflag);
-	add("libpath", &Loader::libpath);
-	add("library", &Loader::library);
+	obj.defines[d] = v;
 }
 
+void BuildInfo::Loader::libpath(const string &s)
+{
+	obj.libpath.push_back(s);
+}
+
+void BuildInfo::Loader::library(const string &s)
+{
+	obj.libs.push_back(s);
+}
 
+void BuildInfo::Loader::warning(const string &s)
+{
+	obj.warnings.push_back(s);
+}