Comment updates

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 2e98906b36c3ef86debaac053ab37c4ae962c489..18f33a093676a2d98c54b4a3c2c9a338d8c10df7 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,39 +3,58 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "misc.h"
 
+/**
+Stores information about compiler command line parameters in a more abstract
+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 &);
        };
        
-       typedef std::list<std::string> InfoList;
+       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;
+
+       DefineMap defines;
+       StringList incpath;
+       StringList libpath;
+       StringList libs;
+       StringList 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.
        
-       InfoList cflags;
-       InfoList defines;
-       InfoList incpath;
-       InfoList ldflags;
-       InfoList libpath;
-       InfoList libs;
-
-       void add(const BuildInfo &);
+       The update level determines what information is updated. */
+       void update_from(const BuildInfo &, UpdateLevel = LOCAL);
+
+       /** 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();
-private:
-       void unique(InfoList &);
 };
 
 #endif