X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=d84173e67029f2bcd7a74a230dc6a7ee388dd090;hb=081e13e6f146d1685bdcb1ec1c82752f4c6d264d;hp=ad30fe5d5db4f36a40d24f8194ffda6548d37882;hpb=82cf6fa5658ccbe612b989e50dfe4e88e617b980;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index ad30fe5..d84173e 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -1,35 +1,27 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef ARCHITECTURE_H_
 #define ARCHITECTURE_H_
 
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "misc.h"
+#include "pattern.h"
 
 class Builder;
 
-// XXX Add lib/exe prefix/suffix fields.  Some archs may need multiple alternatives, how to handle this?
+/**
+Stores information about an architecture.  This includes CPU type, model and
+bitness and operating system.
+*/
 class Architecture
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Architecture>
 	{
-	private:
-		Architecture &arch;
-
 	public:
 		Loader(Architecture &);
-		Architecture &get_object() { return arch; }
-	private:
-		void tool(const std::string &t, const std::string &p);
 	};
 
+	typedef std::list<Pattern> PatternList;
+
 private:
 	Builder &builder;
 	std::string type;
@@ -39,29 +31,31 @@ private:
 	std::string name;
 	bool native;
 	std::string cross_prefix;
-	StringMap tools;
-	BuildInfo build_info;
+	PatternList sharedlib_patterns;
+	PatternList staticlib_patterns;
+	PatternList executable_patterns;
 
 public:
 	Architecture(Builder &b, const std::string &spec);
 
+	const std::string &get_type() const { return type; }
 	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; }
+	bool is_cross() const { return !cross_prefix.empty(); }
 
-	void set_tool(const std::string &t, const std::string &p);
-	void set_cross_prefix(const std::string &);
-	std::string get_tool(const std::string &t) const;
 	const std::string &get_cross_prefix() const { return cross_prefix; }
 
-	const BuildInfo &get_build_info() const { return build_info; }
+	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:
-	std::string resolve_alias(const std::string &) const;
+	static void resolve_aliases(std::vector<std::string> &);
 	void parse_specification(const std::string &);
 };
 
-typedef std::map<std::string, Architecture> ArchMap;
-
 #endif