X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=627ba66ccf6ab6defbcaa960c09fbca775845b14;hb=HEAD;hp=ac31abdc30428307fd46278a44508b1222872dfb;hpb=24b18c22c2b57bf7dc4ac024aca97f9c197445ec;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
deleted file mode 100644
index ac31abd..0000000
--- a/source/architecture.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-#include <limits>
-#ifndef WIN32
-#include <sys/utsname.h>
-#endif
-#include <msp/strings/format.h>
-#include <msp/strings/utils.h>
-#include "architecture.h"
-#include "builder.h"
-
-using namespace std;
-using namespace Msp;
-
-namespace {
-
-const char *types[] =
-{
-	"x86",
-	"arm",
-	"ppc",
-	0
-};
-
-const char *cpus[] =
-{
-	"i386",       "x86",
-	"i486",       "x86",
-	"pentium",    "x86",
-	"pentiumpro", "x86",
-	"pentium2",   "x86",
-	"pentium3",   "x86",
-	"pentium4",   "x86",
-	"core2",      "x86",
-	"nehalem",    "x86",
-	"k6",         "x86",
-	"athlon",     "x86",
-	"athlonxp",   "x86",
-	"athlon64",   "x86",
-	"armv5",      "arm",
-	"armv6",      "arm",
-	"armv7",      "arm",
-	"armv7a",     "arm",
-	0
-};
-
-const char *systems[] =
-{
-	"linux",
-	"freebsd",
-	"darwin",
-	"windows",
-	"android",
-	0
-};
-
-const char *aliases[] =
-{
-	"pc",              "x86",
-	"x86_64",          "x86-64",
-	"amd64",           "x86-64",
-	"i586",            "pentium",
-	"i686",            "pentiumpro",
-	"corei7",          "nehalem",
-	"win32",           "windows-32",
-	"win64",           "windows-64",
-	"power macintosh", "ppc",
-	"armeabi",         "arm",
-	"v7a",             "armv7a",
-	0
-};
-
-}
-
-Architecture::Architecture(Builder &b, const string &spec):
-	builder(b),
-	bits(0),
-	native(false)
-{
-	if(spec.empty())
-	{
-#ifdef WIN32
-		system = "windows";
-#else
-		utsname un;
-		if(uname(&un)==0)
-		{
-			system = tolower(un.sysname);
-			parse_specification(tolower(un.machine));
-			// We really only want to set type for the default arch
-			cpu.clear();
-		}
-#endif
-		bits = sizeof(void *)*numeric_limits<unsigned char>::digits;
-		native = true;
-	}
-	else
-	{
-		parse_specification(spec);
-		const Architecture &native_arch = builder.get_native_arch();
-		if(type.empty())
-			type = native_arch.type;
-		if(system.empty())
-			system = native_arch.system;
-		if(!bits)
-		{
-			if(type==native_arch.type)
-				bits = native_arch.bits;
-			else
-				bits = 32;
-		}
-
-		if(type!=native_arch.type || system!=native_arch.system)
-			cross_prefix = format("%s-%s", type, system);
-		else if(bits==native_arch.bits)
-			native = true;
-	}
-	name = type;
-	if(!cpu.empty())
-		name += format("-%s", cpu);
-	name += format("-%d-%s", bits, system);
-
-	if(system=="windows")
-	{
-		sharedlib_patterns.push_back(Pattern("%.dll"));
-		sharedlib_patterns.push_back(Pattern("lib%.dll"));
-		/* XXX Hack: Consider import libraries (*.dll.a) as dynamic libraries,
-		even though technically they are linked statically. */
-		sharedlib_patterns.push_back(Pattern("lib%.dll.a"));
-		staticlib_patterns.push_back(Pattern("lib%.a"));
-		executable_patterns.push_back(Pattern("%.exe"));
-	}
-	else
-	{
-		if(system=="darwin")
-			sharedlib_patterns.push_back(Pattern("lib%.dylib"));
-		else
-			sharedlib_patterns.push_back(Pattern("lib%.so"));
-		staticlib_patterns.push_back(Pattern("lib%.a"));
-		executable_patterns.push_back(Pattern("%"));
-	}
-}
-
-bool Architecture::match_name(const string &pattern) const
-{
-	bool negate = (pattern[0]=='!');
-	vector<string> parts = split(pattern.substr(negate), "-");
-	resolve_aliases(parts);
-	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-	{
-		if((*i=="32" && bits==32) || (*i=="64" && bits==64))
-			;
-		else if(*i!=type && *i!=cpu && *i!=system)
-			return negate;
-	}
-	return !negate;
-}
-
-string Architecture::best_match(const list<string> &names) const
-{
-	string best;
-	unsigned best_size = 0;
-	for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
-		if(match_name(*i))
-		{
-			/* TODO Do full parse and alias resolution here?  Otherwise x86 and
-			x86_64 are treated as equally good, even though the latter is more
-			specific. */
-			unsigned size = 1;
-			for(string::const_iterator j=i->begin(); j!=i->end(); ++j)
-				size += (*j=='-');
-
-			if(size>best_size)
-			{
-				best = *i;
-				best_size = size;
-			}
-		}
-
-	return best;
-}
-
-void Architecture::resolve_aliases(vector<string> &parts)
-{
-	for(unsigned i=0; i<parts.size(); ++i)
-	{
-		const string &part = parts[i];
-		const char *replace = 0;
-		for(unsigned j=0; (!replace && aliases[j]); j+=2)
-			if(part==aliases[j])
-				replace = aliases[j+1];
-
-		if(replace)
-		{
-			bool has_dash = false;
-			for(const char *c=replace; (!has_dash && *c); ++c)
-				has_dash = (*c=='-');
-
-			if(has_dash)
-			{
-				vector<string> rparts = split(replace, "-");
-				parts[i] = rparts[0];
-				parts.insert(parts.begin()+i+1, rparts.begin()+1, rparts.end());
-				i += rparts.size()-1;
-			}
-			else
-				parts[i] = replace;
-		}
-	}
-}
-
-void Architecture::parse_specification(const string &spec)
-{
-	vector<string> parts = split(spec, "-");
-	resolve_aliases(parts);
-	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-	{
-		bool ok = false;
-
-		for(unsigned j=0; (!ok && types[j]); ++j)
-			if(*i==types[j])
-			{
-				if(!type.empty() && *i!=type)
-					throw invalid_argument("Conflicting type specification");
-				type = *i;
-				ok = true;
-			}
-
-		for(unsigned j=0; (!ok && cpus[j]); j+=2)
-			if(*i==cpus[j])
-			{
-				if(type.empty())
-					type = cpus[j+1];
-				else if(cpus[j+1]!=type)
-					throw invalid_argument("Conflicting CPU specification");
-				cpu = *i;
-				ok = true;
-			}
-
-		for(unsigned j=0; (!ok && systems[j]); ++j)
-			if(*i==systems[j])
-			{
-				system = *i;
-				ok = true;
-			}
-
-		if(!ok && (*i=="32" || *i=="64"))
-		{
-			bits = lexical_cast<unsigned>(*i);
-			ok = true;
-		}
-
-		if(!ok)
-			throw invalid_argument("Unrecognized part in arch specification: "+*i);
-	}
-}
-
-
-Architecture::Loader::Loader(Architecture &a):
-	DataFile::ObjectLoader<Architecture>(a)
-{
-	add("prefix", &Architecture::cross_prefix);
-}