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

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index e9dcec0..a93c29d 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <set>
 #include "buildinfo.h"
 
 using namespace std;
@@ -7,50 +8,66 @@ 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++);
+	}
 }
 
 }
 
 
-void BuildInfo::update_from(const BuildInfo &bi)
+BuildInfo::BuildInfo():
+	threads(false),
+	debug(false),
+	optimize(0),
+	strip(false)
+{ }
+
+void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
-	cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
-	defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
+	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);
 
-	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))
 			{
@@ -69,46 +86,38 @@ void BuildInfo::unique()
 BuildInfo::Loader::Loader(BuildInfo &bi):
 	DataFile::ObjectLoader<BuildInfo>(bi)
 {
-	add("cflag",   &Loader::cflag);
-	add("incpath", &Loader::incpath);
-	add("define",  &Loader::define);
-	add("ldflag",  &Loader::ldflag);
-	add("libpath", &Loader::libpath);
-	add("library", &Loader::library);
-	add("warning", &Loader::warning);
+	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::Loader::cflag(const std::string &s)
-{
-	obj.cflags.push_back(s);
-}
-
-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 &s)
-{
-	obj.defines.push_back(s);
-}
-
-void BuildInfo::Loader::ldflag(const std::string &s)
+void BuildInfo::Loader::define(const string &d, const string &v)
 {
-	obj.ldflags.push_back(s);
+	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);
 }