Use a separate category for import library filename patterns

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 63ec6ba3f3dc5da4f60bd814a592547c0c1c1d15..75a64607a395f7726357d52887fb06e65953277c 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -1,11 +1,14 @@
 #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"
+#include "executable.h"
+#include "importlibrary.h"
+#include "objectfile.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "sysutils.h"
 
 using namespace std;
 using namespace Msp;
@@ -72,6 +75,7 @@ const char *aliases[] =
 {
        "pc",              "x86",
        "x86_64",          "x86-64",
+       "x64",             "x86-64",
        "amd64",           "x86-64",
        "i586",            "pentium",
        "i686",            "pentiumpro",
@@ -95,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;
        }
@@ -147,26 +142,24 @@ Architecture::Architecture(Builder &b, const string &spec):
                name += format("-%s", fpu);
        name += format("-%d-%s-%s", bits, system, toolchain);
 
-       object_patterns.push_back(Pattern("%.o"));
+       add_pattern<ObjectFile>("%.o");
        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"));
-               staticlib_patterns.push_back(Pattern("%.lib"));
-               executable_patterns.push_back(Pattern("%.exe"));
+               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");
        }
        else
        {
                if(system=="darwin")
-                       sharedlib_patterns.push_back(Pattern("lib%.dylib"));
+                       add_pattern<SharedLibrary>("lib%.dylib");
                else
-                       sharedlib_patterns.push_back(Pattern("lib%.so"));
-               staticlib_patterns.push_back(Pattern("lib%.a"));
-               executable_patterns.push_back(Pattern("%"));
+                       add_pattern<SharedLibrary>("lib%.so");
+               add_pattern<StaticLibrary>("lib%.a");
+               add_pattern<Executable>("%");
        }
 }
 
@@ -185,11 +178,11 @@ bool Architecture::match_name(const string &pattern) const
        return !negate;
 }
 
-string Architecture::best_match(const list<string> &names) const
+string Architecture::best_match(const vector<string> &names) const
 {
        string best;
        unsigned best_size = 0;
-       for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
+       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
@@ -209,6 +202,12 @@ string Architecture::best_match(const list<string> &names) const
        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)