X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=5446c04235f3f0465fe64c93f62fc31ce6fdfc4e;hb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;hp=af586192f9ef44b4dafa9103c68ca2b797000e43;hpb=3585dea6eabf5f1565886bf09c2bdb2eee978912;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index af58619..5446c04 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef ARCHITECTURE_H_
 #define ARCHITECTURE_H_
 
 #include <msp/datafile/loader.h>
-#include "misc.h"
+#include "buildinfo.h"
+#include "pattern.h"
 
 class Builder;
 
@@ -19,27 +13,50 @@ class Architecture
 public:
 	class Loader: public Msp::DataFile::Loader
 	{
-	public:
-		Loader(Architecture &);
-		Architecture &get_object() { return arch; }
 	private:
 		Architecture &arch;
 
-		void tool(const std::string &t, const std::string &p);
+	public:
+		Loader(Architecture &);
+		Architecture &get_object() { return arch; }
 	};
 
-	Architecture(Builder &b, const std::string &n, bool a=false);
-	void set_tool(const std::string &t, const std::string &p);
-	std::string get_tool(const std::string &t) const;
+	typedef std::list<Pattern> PatternList;
+
+private:
+	Builder &builder;
+	std::string type;
+	std::string cpu;
+	std::string system;
+	unsigned bits;
+	std::string name;
+	bool native;
+	std::string cross_prefix;
+	PatternList sharedlib_patterns;
+	PatternList staticlib_patterns;
+	PatternList executable_patterns;
+
+public:
+	Architecture(Builder &b, const std::string &spec);
+
 	const std::string &get_name() const { return name; }
+	const std::string &get_system() const { return system; }
+	unsigned get_bits() const { return bits; }
+	const std::string &get_cpu() const { return cpu; }
+	bool match_name(const std::string &) const;
 	bool is_native() const { return native; }
-	const std::string &get_prefix() const { return prefix; }
+	bool is_cross() const { return !cross_prefix.empty(); }
+
+	void set_cross_prefix(const std::string &);
+	const std::string &get_cross_prefix() const { return cross_prefix; }
+
+	const PatternList &get_shared_library_patterns() const { return sharedlib_patterns; }
+	const PatternList &get_static_library_patterns() const { return staticlib_patterns; }
+	const PatternList &get_executable_patterns() const { return executable_patterns; }
+
 private:
-	Builder     &builder;
-	std::string name;
-	bool        native;
-	std::string prefix;
-	StringMap   tools;
+	std::string resolve_alias(const std::string &) const;
+	void parse_specification(const std::string &);
 };
 
 typedef std::map<std::string, Architecture> ArchMap;