Move the bpk files into a subdirectory and install them

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 98f809b2a4ebc379e21d2639f09e936b8c805710..847711e351c3c7fc47ff93b60494e539f8c4c4b3 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -1,10 +1,3 @@
-/* $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>
@@ -23,6 +16,7 @@ const char *types[] =
 {
        "pc",
        "arm",
+       "ppc",
        0
 };
 
@@ -48,16 +42,20 @@ const char *systems[] =
 {
        "linux",
        "freebsd",
+       "darwin",
        "windows",
+       "android",
        0
 };
 
 const char *aliases[] =
 {
+       "x86",   "pc",
        "i586",  "pentium",
        "i686",  "pentiumpro",
        "x86_64", "athlon64",
        "win32", "windows",
+       "power macintosh", "ppc",
        0
 };
 
@@ -91,8 +89,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)
@@ -105,68 +101,48 @@ 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;
-}
-
-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(system=="windows")
        {
-               if(i->second[0]=='-')
-                       return cross_prefix+i->second;
-               else
-                       return i->second;
+               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"));
        }
-
-       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")
+                       sharedlib_patterns.push_back(Pattern("lib%.dylib"));
                else
-                       return native_arch.get_tool(t);
+                       sharedlib_patterns.push_back(Pattern("lib%.so"));
+               staticlib_patterns.push_back(Pattern("lib%.a"));
+               executable_patterns.push_back(Pattern("%"));
        }
-       else
-               throw invalid_argument("Unknown tool");
 }
 
 bool Architecture::match_name(const string &pattern) const
 {
-       vector<string> parts = split(pattern, "-");
+       bool negate = (pattern[0]=='!');
+       vector<string> parts = split(pattern.substr(negate), "-");
        for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
                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 negate;
        }
-       return true;
+       return !negate;
 }
 
 string Architecture::resolve_alias(const string &part) const
@@ -227,13 +203,7 @@ void Architecture::parse_specification(const string &spec)
 
 
 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;
 }