Use a separate category for import library filename patterns

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index c0123015fcd0d78c0d1bc77e772d74fbfcb01a1e..36fe1c129190e83ebd7736e7557a2619d27e9db8 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -6,7 +6,7 @@
 #include "builder.h"
 #include "csourcefile.h"
 #include "executable.h"
-#include "misc.h"
+#include "importlibrary.h"
 #include "sharedlibrary.h"
 #include "staticlibrary.h"
 #include "tool.h"
@@ -35,16 +35,21 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
        builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
 }
 
-FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath &path)
+FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
 {
-       // XXX This will cause trouble with multiple architectures in a single build
-       const Tool *tool = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(name)), true);
+       if(!tool)
+               tool = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(name)), true);
        if(!tool)
                return 0;
-       const Tool::SearchPath &syspath = tool->get_system_path();
+
+       tool->prepare();
 
        list<FS::Path> combined_path(path.begin(), path.end());
-       combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+       if(use_syspath)
+       {
+               const Tool::SearchPath &syspath = tool->get_system_path();
+               combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+       }
 
        for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
        {
@@ -66,23 +71,31 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath
        return 0;
 }
 
-FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, BuildInfo::LibraryMode mode)
+FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, BuildInfo::LibraryMode mode, bool use_syspath)
 {
-       const Tool &linker = builder.get_toolchain().get_tool("LINK");
-       const Tool::SearchPath &syspath = linker.get_system_path();
-
        list<FS::Path> combined_path(path.begin(), path.end());
-       combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+       if(use_syspath)
+       {
+               Tool &linker = builder.get_toolchain().get_tool("LINK");
+               linker.prepare();
+               const Tool::SearchPath &syspath = linker.get_system_path();
+               combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+       }
 
        const Architecture &arch = builder.get_current_arch();
 
        list<string> shared_names;
+       bool use_import_lib = false;
        if(mode!=BuildInfo::FORCE_STATIC)
-               shared_names = Pattern::apply_list(arch.get_shared_library_patterns(), lib);
+       {
+               shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+               if(!(use_import_lib = !shared_names.empty()))
+                       shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+       }
 
        list<string> static_names;
        if(mode!=BuildInfo::FORCE_DYNAMIC)
-               static_names = Pattern::apply_list(arch.get_static_library_patterns(), lib);
+               static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
        for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
        {
@@ -92,24 +105,25 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        FS::Path filename = *i / *j;
                        if(FileTarget *tgt = get_target(filename))
                        {
-                               if(cur_names!=&shared_names || mode==BuildInfo::DYNAMIC)
-                               {
-                                       builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
-                                       return tgt;
-                               }
+                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
+                               return tgt;
                        }
                        else if(file_exists(filename))
                        {
                                builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
                                if(cur_names==&shared_names)
+                               {
+                                       if(use_import_lib)
+                                               return new ImportLibrary(builder, filename);
                                        return new SharedLibrary(builder, filename);
+                               }
                                else
                                        return new StaticLibrary(builder, filename);
                        }
 
                        if(++j==cur_names->end())
                        {
-                               if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)        
+                               if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
                                        cur_names = &static_names;
                                else if(mode==BuildInfo::STATIC && cur_names==&static_names)
                                        cur_names = &shared_names;
@@ -128,7 +142,9 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 FileTarget *VirtualFileSystem::find_binary(const string &name)
 {
        SearchPath path;
-       if(const char *env_path = getenv("PATH"))
+       if(FS::Path(name).is_absolute())
+               path.push_back("/");
+       else if(const char *env_path = getenv("PATH"))
        {
                vector<string> parts = split(env_path, ':');
                for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)