-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <limits>
#ifndef WIN32
#include <sys/utsname.h>
#endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/strings/utils.h>
#include "architecture.h"
#include "builder.h"
const char *cpus[] =
{
- "i386", "pc", 0,
- "i486", "pc", 0,
- "pentium", "pc", 0,
- "i586", "pc", "pentium",
- "pentiumpro", "pc", 0,
- "i686", "pc", "pentiumpro",
- "pentium2", "pc", 0,
- "pentium3", "pc", 0,
- "pentium4", "pc", 0,
- "core2", "pc", 0,
- "k6", "pc", 0,
- "athlon", "pc", 0,
- "athlonxp", "pc", 0,
- "athlon64", "pc", 0,
- "armv5", "arm", 0,
+ "i386", "pc",
+ "i486", "pc",
+ "pentium", "pc",
+ "pentiumpro", "pc",
+ "pentium2", "pc",
+ "pentium3", "pc",
+ "pentium4", "pc",
+ "core2", "pc",
+ "k6", "pc",
+ "athlon", "pc",
+ "athlonxp", "pc",
+ "athlon64", "pc",
+ "armv5", "arm",
0
};
0
};
+const char *aliases[] =
+{
+ "i586", "pentium",
+ "i686", "pentiumpro",
+ "x86_64", "athlon64",
+ "win32", "windows",
+ 0
+};
+
}
Architecture::Architecture(Builder &b, const string &spec):
if(type!=native_arch.type || system!=native_arch.system)
cross_prefix = format("%s-%s", type, system);
- else if(bits!=native_arch.bits)
- {
- build_info.cflags.push_back(format("-m%d", bits));
- build_info.ldflags.push_back(format("-m%d", bits));
- }
- else
+ else if(bits==native_arch.bits)
native = true;
-
- if(!cpu.empty())
- build_info.cflags.push_back(format("-march=%s", cpu));
}
name = type;
if(!cpu.empty())
name += format("-%s", cpu);
name += format("-%d-%s", bits, system);
-}
-void Architecture::set_tool(const string &t, const string &p)
-{
- tools[t] = p;
+ if(system=="windows")
+ {
+ sharedlib_patterns.push_back(Pattern("%.dll"));
+ sharedlib_patterns.push_back(Pattern("lib%.dll"));
+ staticlib_patterns.push_back(Pattern("lib%.a"));
+ staticlib_patterns.push_back(Pattern("lib%.dll.a"));
+ executable_patterns.push_back(Pattern("%.exe"));
+ }
+ else
+ {
+ sharedlib_patterns.push_back(Pattern("lib%.so"));
+ staticlib_patterns.push_back(Pattern("lib%.a"));
+ executable_patterns.push_back(Pattern("%"));
+ }
}
void Architecture::set_cross_prefix(const string &p)
cross_prefix = p;
}
-std::string Architecture::get_tool(const string &t) const
-{
- StringMap::const_iterator i = tools.find(t);
- if(i!=tools.end())
- {
- if(i->second[0]=='-')
- return cross_prefix+i->second;
- else
- return i->second;
- }
-
- const Architecture &native_arch = builder.get_native_arch();
- if(this!=&native_arch)
- {
- if(!cross_prefix.empty())
- return cross_prefix+"-"+native_arch.get_tool(t);
- else
- return native_arch.get_tool(t);
- }
- else
- throw KeyError("Unknown tool", t);
-}
-
bool Architecture::match_name(const string &pattern) const
{
vector<string> parts = split(pattern, "-");
for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
{
- if(*i!=type && *i!=cpu && *i!=system)
+ string part = resolve_alias(*i);
+ if((part=="32" && bits==32) || (part=="64" && bits==64))
+ ;
+ else if(part!=type && part!=cpu && part!=system)
return false;
}
return true;
}
+string Architecture::resolve_alias(const string &part) const
+{
+ for(unsigned j=0; aliases[j]; j+=2)
+ if(part==aliases[j])
+ return aliases[j+1];
+
+ return part;
+}
+
void Architecture::parse_specification(const string &spec)
{
vector<string> parts = split(spec, "-");
for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
{
+ string part = resolve_alias(*i);
+
bool ok = false;
+
for(unsigned j=0; (!ok && types[j]); ++j)
- if(*i==types[j])
+ if(part==types[j])
{
- if(!type.empty() && *i!=type)
- throw InvalidParameterValue("Conflicting type specification");
- type = *i;
+ if(!type.empty() && part!=type)
+ throw invalid_argument("Conflicting type specification");
+ type = part;
ok = true;
}
- for(unsigned j=0; (!ok && cpus[j]); j+=3)
- if(*i==cpus[j])
+
+ for(unsigned j=0; (!ok && cpus[j]); j+=2)
+ if(part==cpus[j])
{
if(type.empty())
type = cpus[j+1];
else if(cpus[j+1]!=type)
- throw InvalidParameterValue("Conflicting CPU specification");
- cpu = (cpus[j+2] ? cpus[j+2] : *i);
+ throw invalid_argument("Conflicting CPU specification");
+ cpu = part;
ok = true;
}
+
for(unsigned j=0; (!ok && systems[j]); ++j)
- if(*i==systems[j])
+ if(part==systems[j])
{
- system = *i;
+ system = part;
ok = true;
}
- if(!ok && (*i=="32" || *i=="64"))
+
+ if(!ok && (part=="32" || part=="64"))
{
- bits = lexical_cast<unsigned>(*i);
+ bits = lexical_cast<unsigned>(part);
ok = true;
}
+
if(!ok)
- throw InvalidParameterValue("Unrecognized part in arch specification: "+*i);
+ throw invalid_argument("Unrecognized part in arch specification: "+*i);
}
}
arch(a)
{
add("prefix", &Architecture::cross_prefix);
- add("tool", &Loader::tool);
-}
-
-void Architecture::Loader::tool(const string &t, const string &p)
-{
- arch.tools[t] = p;
}