X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuildinfo.h;h=11de3b0fe7b2a938b93d76c0bb253210851cb54e;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=2e98906b36c3ef86debaac053ab37c4ae962c489;hpb=683301f94f4a3c5b7e2a7f21087f4185b07c4858;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 2e98906..11de3b0 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,39 +3,47 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.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::Loader
 	{
-	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); }
+	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 libpath(const std::string &);
+		void library(const std::string &);
+		void warning(const std::string &);
 	};
 	
-	typedef std::list<std::string> InfoList;
-	
-	InfoList cflags;
-	InfoList defines;
-	InfoList incpath;
-	InfoList ldflags;
-	InfoList libpath;
-	InfoList libs;
+	StringList cflags;
+	StringList defines;
+	StringList incpath;
+	StringList ldflags;
+	StringList libpath;
+	StringList libs;
+	StringList warnings;
+
+	/** Adds another BuildInfo to the end of this one. */
+	void update_from(const BuildInfo &);
 
-	void add(const BuildInfo &);
+	/** 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