X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=463357dd32d37d19dd31266bc538f7e288051c46;hb=4facd021514ab372c23b1b132d6b4b62baa4efbf;hp=9ad0a557706b687d2a2775044c8fc55e6386019f;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 9ad0a55..463357d 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
 #include "buildinfo.h"
 
@@ -21,7 +14,7 @@ void unique(StringList &l)
 		for(StringList::iterator j=i; j!=l.end();)
 		{
 			if(j!=i && *j==*i)
-				j=l.erase(j);
+				j = l.erase(j);
 			else
 				++j;
 		}
@@ -30,92 +23,97 @@ void unique(StringList &l)
 }
 
 
-void BuildInfo::add(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;
+	}
 }
 
 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)
 	{
-		bool flag=i->compare(0, 3, "no-");
+		bool flag = i->compare(0, 3, "no-");
 
-		string warn=(flag ? *i : i->substr(3));
-		string no_warn="no-"+warn;
+		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);
+				flag = (*j==warn);
+				j = warnings.erase(j);
 			}
 			else
 				++j;
 		}
 
-		*i=(flag ? warn : no_warn);
+		*i = (flag ? warn : no_warn);
 	}
 }
 
 
 BuildInfo::Loader::Loader(BuildInfo &bi):
-	binfo(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);
-}
-
-void BuildInfo::Loader::cflag(const std::string &s)
-{
-	binfo.cflags.push_back(s);
+	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::incpath(const std::string &s)
 {
-	binfo.incpath.push_back(s);
-}
-
-void BuildInfo::Loader::define(const std::string &s)
-{
-	binfo.defines.push_back(s);
+	obj.incpath.push_back(s);
 }
 
-void BuildInfo::Loader::ldflag(const std::string &s)
+void BuildInfo::Loader::define(const std::string &d, const std::string &v)
 {
-	binfo.ldflags.push_back(s);
+	obj.defines[d] = v;
 }
 
 void BuildInfo::Loader::libpath(const std::string &s)
 {
-	binfo.libpath.push_back(s);
+	obj.libpath.push_back(s);
 }
 
 void BuildInfo::Loader::library(const std::string &s)
 {
-	binfo.libs.push_back(s);
+	obj.libs.push_back(s);
 }
 
 void BuildInfo::Loader::warning(const std::string &s)
 {
-	binfo.warnings.push_back(s);
+	obj.warnings.push_back(s);
 }