X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=1bba8195bc536014270ba8eff7664d31e63e7069;hb=8f8f10fe41bbb68866e8fb05f8cbab0b325dc7da;hp=a4035b1c47c3ecb06ce572a388d48dbe3b8219b7;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index a4035b1..1bba819 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,23 +3,108 @@
 
 #include <list>
 #include <string>
+#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:
-	typedef std::list<std::string> InfoList;
+	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
+	};
+
+	class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
+	{
+	public:
+		Loader(BuildInfo &);
+	private:
+		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
+	};
+
+	/**
+	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:
+		typedef T LoadType;
+
+	private:
+		T value;
+		bool set;
+
+	public:
+		Tracked(): value(T()), set(false) { }
+		Tracked(T v): value(v), set(false) { }
+		Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
+
+		Tracked &operator=(T v) { value = v; set = true; return *this; }
+		operator T() const { return value; }
+	};
+
+	typedef std::map<std::string, std::string> DefineMap;
+	typedef std::list<Msp::FS::Path> PathList;
+	typedef std::list<std::string> WordList;
+	typedef std::map<std::string, LibraryMode> LibModeMap;
+	typedef std::map<std::string, std::string> StandardMap;
+
+	Tracked<Msp::FS::Path> sysroot;
+	DefineMap defines;
+	PathList incpath;
+	PathList local_incpath;
+	PathList libpath;
+	WordList libs;
+	Tracked<LibraryMode> libmode;
+	LibModeMap libmodes;
+	WordList keep_symbols;
+	StandardMap 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.
 	
-	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