Use default member initializers and constructor delegation

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 2e98906b36c3ef86debaac053ab37c4ae962c489..26afabffd4db6f323824ddeba99f98954c78c926 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -1,41 +1,122 @@
 #ifndef BUILDINFO_H_
 #define BUILDINFO_H_
 
-#include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <vector>
+#include <msp/datafile/objectloader.h>
+#include <msp/fs/path.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
+       enum LibraryMode
+       {
+               FORCE_STATIC,  //< Only accept static libraries
+               STATIC,        //< Prefer static libraries but accept dynamic as well
+               DYNAMIC,       //< Prefer dynamic libraries but accept static as well
+               FORCE_DYNAMIC  //< Only accept dynamic libraries
+       };
+
+       enum RuntimePathMode
+       {
+               NO_RPATH,  //< Do not record rpath in binaries
+               RELATIVE,  //< Record relative rpath in binaries
+               ABSOLUTE   //< Record absolute rpath in binaries
+       };
+
+       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 keep_symbol(const std::string &);
+               void libmode_for_lib(const std::string &, LibraryMode);
+               void libpath(const std::string &);
+               void library(const std::string &);
+               void local_incpath(const std::string &);
+               void standard(Msp::DataFile::Symbol, const std::string &);
+               void sysroot(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
+       };
+
+       struct LanguageStandard
+       {
+               std::string type;
+               unsigned year = 0;
+
+               LanguageStandard() = default;
+               LanguageStandard(const std::string &);
+
+               std::string str() const;
+       };
+
+       /**
+       A wrapper which tracks the set status of the wrapped variable.  A default
+       value may be provided in initialization without causing it to be treated as
+       set.  Assigning from a raw value flags the Tracked object as set.  Assigning
+       from another Tracked object will only change the value of the target if the
+       source is set.  
+       */
+       template<typename T>
+       class Tracked
+       {
+       public:
+               using LoadType = T;
+
+       private:
+               T value{};
+               bool set = false;
+
+       public:
+               Tracked() = default;
+               Tracked(T v): value(v) { }
+               Tracked(const Tracked &t) = default;
+               Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
+
+               Tracked &operator=(const T &v) { value = v; set = true; return *this; }
+               operator const T &() const { return value; }
+       };
+
+       Tracked<Msp::FS::Path> sysroot;
+       std::map<std::string, std::string> defines;
+       std::vector<Msp::FS::Path> incpath;
+       std::vector<Msp::FS::Path> local_incpath;
+       std::vector<Msp::FS::Path> libpath;
+       std::vector<std::string> libs;
+       Tracked<LibraryMode> libmode = DYNAMIC;
+       Tracked<RuntimePathMode> rpath_mode = NO_RPATH;
+       std::map<std::string, LibraryMode> libmodes;
+       std::vector<std::string> keep_symbols;
+       std::map<std::string, LanguageStandard> standards;
+       Tracked<bool> threads = false;
+       Tracked<bool> debug = false;
+       Tracked<int> optimize = 0;
+       Tracked<bool> strip = false;
+       Tracked<unsigned> warning_level = 0;
+       Tracked<bool> fatal_warnings = false;
+
+       /** Returns the library mode for linking a particular library.  If no mode
+       has been specified for that library, the the global library mode is
+       returned. */
+       LibraryMode get_libmode_for(const std::string &) const;
+
+       /** 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 &);
-       void unique();
-private:
-       void unique(InfoList &);
+       The update level determines what information is updated. */
+       void update_from(const BuildInfo &, UpdateLevel = LOCAL);
 };
 
 #endif