X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=d3bc708faf99cbf25944d764f7054d40c643be00;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=0dc8de604ffd4253e4ae51e4920ef4c95dd09d0a;hpb=2f1e3b296bb8a2c4fcb73d7339cf7d0d6f9d1459;p=builder.git diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp index 0dc8de6..d3bc708 100644 --- a/source/virtualfilesystem.cpp +++ b/source/virtualfilesystem.cpp @@ -1,10 +1,12 @@ +#include #include #include #include #include #include "builder.h" #include "csourcefile.h" -#include "misc.h" +#include "executable.h" +#include "importlibrary.h" #include "sharedlibrary.h" #include "staticlibrary.h" #include "tool.h" @@ -20,7 +22,7 @@ VirtualFileSystem::VirtualFileSystem(Builder &b): FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const { - TargetMap::const_iterator i = targets.find(p.str()); + auto i = targets.find(p.str()); if(i!=targets.end()) return static_cast(i->second); return 0; @@ -28,102 +30,154 @@ FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t) { - targets.insert(TargetMap::value_type(path.str(), t)); + targets.insert({ path, t }); nonexistent.erase(path); - builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name())); + builder.get_logger().log("vfs", "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(); - list combined_path(path.begin(), path.end()); - combined_path.insert(combined_path.end(), syspath.begin(), syspath.end()); + tool->prepare(); + + SearchPath combined_path = path; + if(use_syspath) + { + const SearchPath &syspath = tool->get_system_path(); + combined_path.insert(combined_path.end(), syspath.begin(), syspath.end()); + } - for(list::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i) + for(const FS::Path &p: combined_path) { - FS::Path filename = *i/name; + FS::Path filename = p/name; if(FileTarget *tgt = get_target(filename)) { - builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, i->str(), tgt->get_type())); + builder.get_logger().log("vfs", "Header %s found in %s as existing %s", name, p.str(), tgt->get_type()); return tgt; } else if(file_exists(filename)) { - builder.get_logger().log("vfs", format("Header %s found in %s", name, i->str())); + builder.get_logger().log("vfs", "Header %s found in %s", name, p.str()); return dynamic_cast(tool->create_source(filename)); } - builder.get_logger().log("vfs", format("Header %s not found in %s", name, i->str())); + builder.get_logger().log("vfs", "Header %s not found in %s", name, p.str()); } return 0; } -FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, LibMode 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 combined_path(path.begin(), path.end()); - combined_path.insert(combined_path.end(), syspath.begin(), syspath.end()); + SearchPath combined_path = path; + if(use_syspath) + { + Tool &linker = builder.get_toolchain().get_tool("LINK"); + linker.prepare(); + const SearchPath &syspath = linker.get_system_path(); + combined_path.insert(combined_path.end(), syspath.begin(), syspath.end()); + } const Architecture &arch = builder.get_current_arch(); - /* Try dynamic libraries only if library mode permits it */ - list shared_names; - if(mode!=ALL_STATIC) + vector shared_names; + bool use_import_lib = false; + if(mode!=BuildInfo::FORCE_STATIC) { - const list &shared_patterns = arch.get_shared_library_patterns(); - for(list::const_iterator i=shared_patterns.begin(); i!=shared_patterns.end(); ++i) - shared_names.push_back(i->apply(lib)); + shared_names = Pattern::apply_list(arch.get_patterns(), lib); + if(!(use_import_lib = !shared_names.empty())) + shared_names = Pattern::apply_list(arch.get_patterns(), lib); } - /* Static libraries are always considered, since sometimes shared versions - may not be available */ - list static_names; - const list &static_patterns = arch.get_static_library_patterns(); - for(list::const_iterator i=static_patterns.begin(); i!=static_patterns.end(); ++i) - static_names.push_back(i->apply(lib)); + vector static_names; + if(mode!=BuildInfo::FORCE_DYNAMIC) + static_names = Pattern::apply_list(arch.get_patterns(), lib); - for(list::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i) + for(const FS::Path &p: combined_path) { - bool shared = true; - for(list::const_iterator j=shared_names.begin(); j!=static_names.end(); ) + const vector *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names); + for(auto j=cur_names->begin(); j!=cur_names->end(); ) { - if(j==shared_names.end()) - { - j = static_names.begin(); - shared = false; - continue; - } - - FS::Path filename = *i / *j; + FS::Path filename = p / *j; if(FileTarget *tgt = get_target(filename)) { - if(!shared || mode==DYNAMIC || !tgt->get_package()) - { - 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", "Library %s (%s) found in %s as existing %s", lib, *j, p.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(shared) + builder.get_logger().log("vfs", "Library %s (%s) found in %s", lib, *j, p.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); } - ++j; + if(++j==cur_names->end()) + { + 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; + else + break; + j = cur_names->begin(); + } + } + + builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str()); + } + + return 0; +} + +FileTarget *VirtualFileSystem::find_binary(const string &name) +{ + SearchPath path; + if(FS::Path(name).is_absolute()) + path.push_back("/"); + else + { + if(sys_bin_path.empty()) + { + string env_path = Msp::getenv("PATH"); + if(!env_path.empty()) + { + for(const string &p: split(env_path, ':')) + sys_bin_path.push_back(p); + } + else + { + sys_bin_path.push_back("/bin"); + sys_bin_path.push_back("/usr/bin"); + } + } + path = sys_bin_path; + } + + for(const FS::Path &p: path) + { + FS::Path filename = p/name; + if(FileTarget *tgt = get_target(filename)) + { + builder.get_logger().log("vfs", "Binary %s found in %s as existing %s", name, p, tgt->get_type()); + return tgt; + } + else if(file_exists(filename)) + { + builder.get_logger().log("vfs", "Binary %s found in %s", name, p); + return new Executable(builder, filename); } - builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str())); + builder.get_logger().log("vfs", "Binary %s not found in %s", name, p); } return 0;