]> git.tdb.fi Git - builder.git/blobdiff - source/architecture.cpp
Use a separate category for import library filename patterns
[builder.git] / source / architecture.cpp
index cf888f00e24ede0d80ee16952fb5c63724c53738..75a64607a395f7726357d52887fb06e65953277c 100644 (file)
@@ -1,18 +1,14 @@
-/* $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"
+#include "executable.h"
+#include "importlibrary.h"
+#include "objectfile.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "sysutils.h"
 
 using namespace std;
 using namespace Msp;
@@ -21,26 +17,40 @@ namespace {
 
 const char *types[] =
 {
-       "pc",
+       "x86",
        "arm",
+       "ppc",
        0
 };
 
 const char *cpus[] =
 {
-       "i386",       "pc",
-       "i486",       "pc",
-       "pentium",    "pc",
-       "pentiumpro", "pc",
-       "pentium2",   "pc",
-       "pentium3",   "pc",
-       "pentium4",   "pc",
-       "core2",      "pc",
-       "k6",         "pc",
-       "athlon",     "pc",
-       "athlonxp",   "pc",
-       "athlon64",   "pc",
+       "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 *fpus[] =
+{
+       "387",   "x86",
+       "sse",   "x86",
+       "vfpv3", "arm",
+       "neon",  "arm",
        0
 };
 
@@ -48,15 +58,35 @@ const char *systems[] =
 {
        "linux",
        "freebsd",
+       "darwin",
        "windows",
+       "android",
+       0
+};
+
+const char *toolchains[] =
+{
+       "gnu",
+       "clang",
        0
 };
 
 const char *aliases[] =
 {
-       "i586",  "pentium",
-       "i686",  "pentiumpro",
-       "win32", "windows",
+       "pc",              "x86",
+       "x86_64",          "x86-64",
+       "x64",             "x86-64",
+       "amd64",           "x86-64",
+       "i586",            "pentium",
+       "i686",            "pentiumpro",
+       "corei7",          "nehalem",
+       "win32",           "windows-32",
+       "win64",           "windows-64",
+       "power macintosh", "ppc",
+       "armeabi",         "arm",
+       "v7a",             "armv7a",
+       "gcc",             "gnu",
+       "mingw",           "windows-gnu",
        0
 };
 
@@ -69,18 +99,9 @@ Architecture::Architecture(Builder &b, const string &spec):
 {
        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
+               parse_specification(get_system_type());
+               // We really only want to set type for the default arch
+               cpu.clear();
                bits = sizeof(void *)*numeric_limits<unsigned char>::digits;
                native = true;
        }
@@ -90,8 +111,6 @@ Architecture::Architecture(Builder &b, const string &spec):
                const Architecture &native_arch = builder.get_native_arch();
                if(type.empty())
                        type = native_arch.type;
-               if(cpu.empty())
-                       cpu = native_arch.cpu;
                if(system.empty())
                        system = native_arch.system;
                if(!bits)
@@ -104,133 +123,185 @@ 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));
+       if(toolchain.empty())
+       {
+               if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang"))
+                       toolchain = "clang";
+               else
+                       toolchain = "gnu";
        }
+
        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;
-}
-
-void Architecture::set_cross_prefix(const string &p)
-{
-       cross_prefix = p;
-}
+       if(!fpu.empty())
+               name += format("-%s", fpu);
+       name += format("-%d-%s-%s", bits, system, toolchain);
 
-std::string Architecture::get_tool(const string &t) const
-{
-       StringMap::const_iterator i = tools.find(t);
-       if(i!=tools.end())
+       add_pattern<ObjectFile>("%.o");
+       if(system=="windows")
        {
-               if(i->second[0]=='-')
-                       return cross_prefix+i->second;
-               else
-                       return i->second;
+               add_pattern<SharedLibrary>("%.dll");
+               add_pattern<SharedLibrary>("lib%.dll");
+               add_pattern<ImportLibrary>("lib%.dll.a");
+               add_pattern<StaticLibrary>("lib%.a");
+               add_pattern<StaticLibrary>("%.lib");
+               add_pattern<Executable>("%.exe");
        }
-
-       const Architecture &native_arch = builder.get_native_arch();
-       if(this!=&native_arch)
+       else
        {
-               if(!cross_prefix.empty())
-                       return cross_prefix+"-"+native_arch.get_tool(t);
+               if(system=="darwin")
+                       add_pattern<SharedLibrary>("lib%.dylib");
                else
-                       return native_arch.get_tool(t);
+                       add_pattern<SharedLibrary>("lib%.so");
+               add_pattern<StaticLibrary>("lib%.a");
+               add_pattern<Executable>("%");
        }
-       else
-               throw KeyError("Unknown tool", t);
 }
 
 bool Architecture::match_name(const string &pattern) const
 {
-       vector<string> parts = split(pattern, "-");
+       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)
        {
-               string part = resolve_alias(*i);
-               if(part!=type && part!=cpu && part!=system)
-                       return false;
+               if((*i=="32" && bits==32) || (*i=="64" && bits==64))
+                       ;
+               else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain)
+                       return negate;
        }
-       return true;
+       return !negate;
 }
 
-string Architecture::resolve_alias(const string &part) const
+string Architecture::best_match(const vector<string> &names) const
 {
-       for(unsigned j=0; aliases[j]; j+=2)
-               if(part==aliases[j])
-                       return aliases[j+1];
+       string best;
+       unsigned best_size = 0;
+       for(vector<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=='-');
 
-       return part;
+                       if(size>best_size)
+                       {
+                               best = *i;
+                               best_size = size;
+                       }
+               }
+
+       return best;
+}
+
+template<typename T>
+void Architecture::add_pattern(const string &pat)
+{
+       filename_patterns[typeid(T).name()].push_back(Pattern(pat));
+}
+
+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)
        {
-               string part = resolve_alias(*i);
-
                bool ok = false;
 
                for(unsigned j=0; (!ok && types[j]); ++j)
-                       if(part==types[j])
+                       if(*i==types[j])
                        {
-                               if(!type.empty() && part!=type)
-                                       throw InvalidParameterValue("Conflicting type specification");
-                               type = part;
+                               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(part==cpus[j])
+                       if(*i==cpus[j])
                        {
                                if(type.empty())
                                        type = cpus[j+1];
                                else if(cpus[j+1]!=type)
-                                       throw InvalidParameterValue("Conflicting CPU specification");
-                               cpu = part;
+                                       throw invalid_argument("Conflicting CPU specification");
+                               cpu = *i;
+                               ok = true;
+                       }
+
+               for(unsigned j=0; (!ok && fpus[j]); j+=2)
+                       if(*i==fpus[j])
+                       {
+                               if(fpus[j+1]!=type)
+                                       throw invalid_argument("Conflicting FPU specification");
+                               fpu = *i;
                                ok = true;
                        }
 
                for(unsigned j=0; (!ok && systems[j]); ++j)
-                       if(part==systems[j])
+                       if(*i==systems[j])
                        {
-                               system = part;
+                               system = *i;
                                ok = true;
                        }
 
-               if(!ok && (part=="32" || part=="64"))
+               for(unsigned j=0; (!ok && toolchains[j]); ++j)
+                       if(*i==toolchains[j])
+                       {
+                               toolchain = *i;
+                               ok = true;
+                       }
+
+               if(!ok && (*i=="32" || *i=="64"))
                {
-                       bits = lexical_cast<unsigned>(part);
+                       bits = lexical_cast<unsigned>(*i);
                        ok = true;
                }
 
                if(!ok)
-                       throw InvalidParameterValue("Unrecognized part in arch specification: "+*i);
+                       throw invalid_argument("Unrecognized part in arch specification: "+*i);
        }
 }
 
 
 Architecture::Loader::Loader(Architecture &a):
-       arch(a)
+       DataFile::ObjectLoader<Architecture>(a)
 {
        add("prefix", &Architecture::cross_prefix);
-       add("tool",   &Loader::tool);
-}
-
-void Architecture::Loader::tool(const string &t, const string &p)
-{
-       arch.tools[t] = p;
 }