X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=f84315c74369b7b73f6f4e839ff0a8701193627f;hb=3938f8030b1f62802decce19777ce70fdafaff10;hp=ccd4b86798db7cc4a8c96eafffaef56c0ea82f82;hpb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index ccd4b86..f84315c 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,38 +3,122 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
-#include "misc.h"
+#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 &);
+	};
+	
+	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;
+
+		LanguageStandard(): year(0) { }
+		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;
+
+	public:
+		Tracked(): value(T()), set(false) { }
+		Tracked(T v): value(v), set(false) { }
+		Tracked(const Tracked &t): value(t.value), set(t.set) { }
+		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::list<Msp::FS::Path> incpath;
+	std::list<Msp::FS::Path> local_incpath;
+	std::list<Msp::FS::Path> libpath;
+	std::list<std::string> libs;
+	Tracked<LibraryMode> libmode;
+	Tracked<RuntimePathMode> rpath_mode;
+	std::map<std::string, LibraryMode> libmodes;
+	std::list<std::string> keep_symbols;
+	std::map<std::string, LanguageStandard> standards;
+	Tracked<bool> threads;
+	Tracked<bool> debug;
+	Tracked<int> optimize;
+	Tracked<bool> strip;
+	Tracked<unsigned> warning_level;
+	Tracked<bool> fatal_warnings;
+
+	BuildInfo();
+
+	/** 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.
 	
-	StringList cflags;
-	StringList defines;
-	StringList incpath;
-	StringList ldflags;
-	StringList libpath;
-	StringList libs;
-
-	void add(const BuildInfo &);
-	void unique();
-private:
-	void unique(StringList &);
+	The update level determines what information is updated. */
+	void update_from(const BuildInfo &, UpdateLevel = LOCAL);
 };
 
 #endif