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

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 2372e89..1d598ca 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <set>
+#include <msp/strings/format.h>
 #include "buildinfo.h"
 
 using namespace std;
@@ -26,60 +27,54 @@ void unique(list<T> &l)
 
 
 BuildInfo::BuildInfo():
+	libmode(DYNAMIC),
 	threads(false),
 	debug(false),
 	optimize(0),
-	strip(false)
+	strip(false),
+	warning_level(0),
+	fatal_warnings(false)
 { }
 
+BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
+{
+	LibModeMap::const_iterator i = libmodes.find(lib);
+	if(i!=libmodes.end())
+		return i->second;
+	return libmode;
+}
+
 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());
+	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
 	if(level!=CHAINED)
 	{
-		libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-		libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+		libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
+		libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
 	}
-	warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.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();
-}
-
-void BuildInfo::unique()
-{
-	::unique(incpath);
-	::unique(libpath);
-	::unique(libs);
-
-	for(StringList::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();)
-		{
-			if(j!=i && (*j==warn || *j==no_warn))
-			{
-				flag = (*j==warn);
-				j = warnings.erase(j);
-			}
-			else
-				++j;
-		}
-
-		*i = (flag ? warn : no_warn);
-	}
+	unique(incpath);
+	unique(libpath);
+	unique(libs);
 }
 
 
@@ -89,12 +84,19 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	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",  &Loader::warning);
+	add("warning_level", &BuildInfo::warning_level);
+	add("fatal_warnings", &BuildInfo::fatal_warnings);
 }
 
 void BuildInfo::Loader::incpath(const string &s)
@@ -107,6 +109,16 @@ 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)
 {
 	obj.libpath.push_back(s);
@@ -117,7 +129,32 @@ void BuildInfo::Loader::library(const string &s)
 	obj.libs.push_back(s);
 }
 
-void BuildInfo::Loader::warning(const string &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)
 {
-	obj.warnings.push_back(s);
+	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()));
 }