]> git.tdb.fi Git - builder.git/blobdiff - source/buildinfo.cpp
Add a list of symbols to keep in the binary to BuildInfo
[builder.git] / source / buildinfo.cpp
index 82596253fe8ee103b8d153a70eeb3a9377c1c69f..1d598caa7a42a56178d25cee7b9f35800f903098 100644 (file)
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
+#include <set>
+#include <msp/strings/format.h>
 #include "buildinfo.h"
 
 using namespace std;
@@ -14,108 +9,152 @@ 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::add(const BuildInfo &bi)
+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());
-       warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.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);
-       ::unique(incpath);
-       ::unique(ldflags);
-       ::unique(libpath);
-       ::unique(libs);
-
-       for(StringList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
+       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)
        {
-               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);
+               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(libpath);
+       unique(libs);
 }
 
 
 BuildInfo::Loader::Loader(BuildInfo &bi):
-       binfo(bi)
+       DataFile::ObjectLoader<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_level", &BuildInfo::warning_level);
+       add("fatal_warnings", &BuildInfo::fatal_warnings);
+}
+
+void BuildInfo::Loader::incpath(const string &s)
+{
+       obj.incpath.push_back(s);
+}
+
+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);
-       add("warning", &Loader::warning);
+       obj.defines[d] = v;
 }
 
-void BuildInfo::Loader::cflag(const std::string &s)
+void BuildInfo::Loader::keep_symbol(const string &s)
 {
-       binfo.cflags.push_back(s);
+       obj.keep_symbols.push_back(s);
 }
 
-void BuildInfo::Loader::incpath(const std::string &s)
+void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
 {
-       binfo.incpath.push_back(s);
+       obj.libmodes[l] = m;
 }
 
-void BuildInfo::Loader::define(const std::string &s)
+void BuildInfo::Loader::libpath(const string &s)
 {
-       binfo.defines.push_back(s);
+       obj.libpath.push_back(s);
 }
 
-void BuildInfo::Loader::ldflag(const std::string &s)
+void BuildInfo::Loader::library(const string &s)
 {
-       binfo.ldflags.push_back(s);
+       obj.libs.push_back(s);
 }
 
-void BuildInfo::Loader::libpath(const std::string &s)
+void BuildInfo::Loader::local_incpath(const string &s)
 {
-       binfo.libpath.push_back(s);
+       obj.local_incpath.push_back(s);
 }
 
-void BuildInfo::Loader::library(const std::string &s)
+void BuildInfo::Loader::standard(DataFile::Symbol tag, const string &std)
 {
-       binfo.libs.push_back(s);
+       obj.standards[tag.name] = std;
 }
 
-void BuildInfo::Loader::warning(const std::string &s)
+void BuildInfo::Loader::sysroot(const string &s)
+{
+       obj.sysroot = s;
+}
+
+
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
-       binfo.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()));
 }