Use Path objects to store include and library paths

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 10fd3bec439c3ad6a16379e6453d1e877325f0d1..144a16dabb0e1e3215290745566b827bb63b220e 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -13,32 +13,51 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
        {
        public:
                Loader(BuildInfo &);
        private:
-               BuildInfo &binfo;
-               
-               void cflag(const std::string &s)   { binfo.cflags.push_back(s); }
-               void incpath(const std::string &s) { binfo.incpath.push_back(s); }
-               void define(const std::string &s)  { binfo.defines.push_back(s); }
-               void ldflag(const std::string &s)  { binfo.ldflags.push_back(s); }
-               void libpath(const std::string &s) { binfo.libpath.push_back(s); }
-               void library(const std::string &s) { binfo.libs.push_back(s); }
+               void incpath(const std::string &);
+               void define(const std::string &, const std::string &);
+               void libpath(const std::string &);
+               void library(const std::string &);
+               void warning(const std::string &);
        };
        
-       StringList cflags;
-       StringList defines;
-       StringList incpath;
-       StringList ldflags;
-       StringList libpath;
-       StringList libs;
-
-       void add(const BuildInfo &);
-       void unique();
+       enum UpdateLevel
+       {
+               LOCAL,       //< Include all information
+               DEPENDENCY,  //< Include all but code generation options
+               CHAINED      //< Include only compilation options
+       };
+
+       typedef std::map<std::string, std::string> DefineMap;
+       typedef std::list<Msp::FS::Path> PathList;
+       typedef std::list<std::string> WordList;
+
+       DefineMap defines;
+       PathList incpath;
+       PathList libpath;
+       WordList libs;
+       WordList warnings;
+       bool threads;
+       bool debug;
+       int optimize;
+       bool strip;
+
+       BuildInfo();
+
+       /** Updates the BuildInfo from another one.  Lists are concatenated, with
+       the first occurrence of each item preserved.  Scalars are overwritten.
+       
+       The update level determines what information is updated. */
+       void update_from(const BuildInfo &, UpdateLevel = LOCAL);
+
 private:
-       void unique(StringList &);
+       /** Makes sure there are no duplicate entries in the lists.  For warnings,
+       contradicting flags are eliminated and the last one stays in effect. */
+       void unique();
 };
 
 #endif