Make tools capable of reporting a system-wide path used to locate input files

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index e89b2dd61c0a6978cd3dd8cb9d9711375bb57d02..d5cf909e5f7c284d6121917b4f82f51ab2cea273 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -2,10 +2,10 @@
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
+#include "csourcefile.h"
 #include "misc.h"
-#include "header.h"
 #include "sharedlibrary.h"
-#include "systemlibrary.h"
+#include "staticlibrary.h"
 #include "virtualfilesystem.h"
 
 using namespace std;
@@ -40,46 +40,19 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
        targets.insert(TargetMap::value_type(path.str(), t));
 }
 
-FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path &from, const list<string> &path)
+FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath &path)
 {
        string hash(8, 0);
-       if(include[0]=='\"')
-               update_hash(hash, from.str());
        for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
                update_hash(hash, *i);
 
-       string id = hash+include;
+       string id = hash+name;
        TargetMap::iterator i = include_cache.find(id);
        if(i!=include_cache.end())
                return i->second;
 
-       static string cxx_ver;
-       if(cxx_ver.empty())
-       {
-               // XXX This needs to go elsewhere
-               /*StringList argv;
-               argv.push_back(current_arch->get_tool("CXX"));
-               argv.push_back("--version");
-               if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv)))
-               {
-                       cxx_ver = m[0].str;
-                       while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
-                       {
-                               string::size_type dot = cxx_ver.rfind('.');
-                               if(dot==string::npos)
-                                       break;
-                               cxx_ver.erase(dot);
-                       }
-                       if(verbose>=5)
-                               IO::print("C++ version is %s\n", cxx_ver);
-               }
-               else*/
-                       cxx_ver = "-";
-       }
-
-       string fn = include.substr(1);
        if(builder.get_verbose()>=5)
-               IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
+               IO::print("Looking for header %s with path %s\n", name, join(path.begin(), path.end()));
 
        SearchPath syspath;
        const Architecture &arch = builder.get_current_arch();
@@ -91,12 +64,10 @@ FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path
                syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
 
        FileTarget *tgt = 0;
-       if(include[0]=='\"')
-               tgt = get_header(FS::Path(from)/fn);
-       for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt = get_header(FS::Path(*j)/fn);
-       for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-               tgt = get_header(FS::Path(*j)/fn);
+       for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
+               tgt = get_header(FS::Path(*j)/name);
+       for(SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+               tgt = get_header(FS::Path(*j)/name);
 
        include_cache.insert(TargetMap::value_type(id, tgt));
 
@@ -150,7 +121,7 @@ FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
 
        if(FS::is_reg(fn))
        {
-               tgt = new SystemHeader(builder, fn.str());
+               tgt = new CSourceFile(builder, fn);
                return tgt;
        }
        return 0;
@@ -158,50 +129,44 @@ FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
 
 FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &path, LibMode mode)
 {
-       // Populate a list of candidate filenames
-       StringList candidates;
-
        const Architecture &arch = builder.get_current_arch();
+
+       /* Try dynamic libraries only if library mode permits it */
        if(mode!=ALL_STATIC)
        {
-               // XXX Should probably let the Architecture populate the list
-               if(arch.get_system()=="windows")
+               FS::Path fn = try_patterns(path, arch.get_shared_library_patterns(), lib);
+               if(!fn.empty())
                {
-                       candidates.push_back("lib"+lib+".dll");
-                       candidates.push_back(lib+".dll");
+                       FileTarget *tgt = get_target(fn);
+                       if(!tgt)
+                               return new SharedLibrary(builder, fn);
+                       else if(mode==DYNAMIC || !tgt->get_package())
+                               return tgt;
                }
-               else
-                       candidates.push_back("lib"+lib+".so");
        }
 
        /* Static libraries are always considered, since sometimes shared versions
        may not be available */
-       candidates.push_back("lib"+lib+".a");
-       if(arch.get_system()=="windows")
-               candidates.push_back("lib"+lib+".dll.a");
-
-       for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+       FS::Path fn = try_patterns(path, arch.get_static_library_patterns(), lib);
+       if(!fn.empty())
        {
-               FS::Path full = path/ *i;
-               FileTarget *tgt = get_target(full);
-
-               if(tgt)
-               {
-                       Target *real_tgt = tgt->get_real_target();
-
-                       /* Ignore dynamic libraries from local packages unless library mode is
-                       DYNAMIC */
-                       if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
-                               continue;
-                       else if(tgt)
-                               return tgt;
-               }
-               else if(FS::is_reg(full))
-               {
-                       tgt = new SystemLibrary(builder, full.str());
+               if(FileTarget *tgt = get_target(fn))
                        return tgt;
-               }
+               else
+                       return new StaticLibrary(builder, fn);
        }
 
        return 0;
 }
+
+FS::Path VirtualFileSystem::try_patterns(const FS::Path &dir, const list<Pattern> &patterns, const string &base)
+{
+       for(list<Pattern>::const_iterator i=patterns.begin(); i!=patterns.end(); ++i)
+       {
+               FS::Path full = dir/i->apply(base);
+               if(get_target(full) || FS::is_reg(full))
+                       return full;
+       }
+
+       return FS::Path();
+}