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

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 340fd96..1d598ca 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,46 +1,160 @@
-#include <msp/algo.h>
+#include <algorithm>
+#include <set>
+#include <msp/strings/format.h>
 #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)
+{
+	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),
+	strip(false),
+	warning_level(0),
+	fatal_warnings(false)
+{ }
+
+BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
 {
-	cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
-	defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
-	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());
+	LibModeMap::const_iterator i = libmodes.find(lib);
+	if(i!=libmodes.end())
+		return i->second;
+	return libmode;
 }
 
-void BuildInfo::unique()
+void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
-	unique(cflags);
-	unique(defines);
+	for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
+		defines[i->first] = i->second;
+	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
+	if(level!=CHAINED)
+	{
+		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;
+		for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
+			libmodes[i->first] = i->second;
+		keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
+		for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+			standards[i->first] = i->second;
+		debug = bi.debug;
+		optimize = bi.optimize;
+		strip = bi.strip;
+		warning_level = bi.warning_level;
+		fatal_warnings = bi.fatal_warnings;
+	}
+
 	unique(incpath);
-	unique(ldflags);
 	unique(libpath);
 	unique(libs);
 }
 
-void BuildInfo::unique(InfoList &l)
+
+BuildInfo::Loader::Loader(BuildInfo &bi):
+	DataFile::ObjectLoader<BuildInfo>(bi)
 {
-	InfoList l2;
-	for(InfoList::iterator i=l.begin(); i!=l.end(); ++i)
-		if(!contains(l2, *i))
-			l2.push_back(*i);
-	swap(l, l2);
+	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("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);
 }
 
-BuildInfo::Loader::Loader(BuildInfo &bi):
-	binfo(bi)
+void BuildInfo::Loader::incpath(const string &s)
+{
+	obj.incpath.push_back(s);
+}
+
+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)
 {
-	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.libpath.push_back(s);
 }
 
+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>>(const 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()));
+}