Comment updates

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 26e56c17f01ca10232438b5e53cc0c5d2ae1c233..18f33a093676a2d98c54b4a3c2c9a338d8c10df7 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -13,33 +13,44 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
        {
-       private:
-               BuildInfo &binfo;
-               
        public:
                Loader(BuildInfo &);
        private:
-               void cflag(const std::string &);
                void incpath(const std::string &);
-               void define(const std::string &);
-               void ldflag(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;
+       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 ldflags;
        StringList libpath;
        StringList libs;
        StringList warnings;
+       bool threads;
+       bool debug;
+       int optimize;
+       bool strip;
+
+       BuildInfo();
 
-       /** Adds another BuildInfo to the end of this one. */
-       void add(const 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);
 
        /** Makes sure there are no duplicate entries in the lists.  For warnings,
        contradicting flags are eliminated and the last one stays in effect. */