X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=7855e04ac99bc148bbbc2dbd4c685fafd01214e3;hb=1ec533a7777be4dce9c8b6bbb1cbc32d38098ae4;hp=5c548980073b9b46ac39da6982e4e5c2c8abfb66;hpb=07503a34b80778fe74977f0fb0c2094c92d64ce0;p=builder.git diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp index 5c54898..7855e04 100644 --- a/source/virtualfilesystem.cpp +++ b/source/virtualfilesystem.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -22,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; @@ -30,18 +30,20 @@ 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())); } -FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath &path, bool use_syspath) +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; + tool->prepare(); + list combined_path(path.begin(), path.end()); if(use_syspath) { @@ -49,21 +51,21 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath 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", format("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", format("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", format("Header %s not found in %s", name, p.str())); } return 0; @@ -74,7 +76,8 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath list combined_path(path.begin(), path.end()); if(use_syspath) { - const Tool &linker = builder.get_toolchain().get_tool("LINK"); + 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()); } @@ -82,33 +85,35 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath const Architecture &arch = builder.get_current_arch(); list 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(), lib); + if(!(use_import_lib = !shared_names.empty())) + shared_names = Pattern::apply_list(arch.get_patterns(), lib); + } list 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(), lib); - for(list::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i) + for(const FS::Path &p: combined_path) { const list *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names); - for(list::const_iterator j=cur_names->begin(); j!=cur_names->end(); ) + for(auto j=cur_names->begin(); j!=cur_names->end(); ) { - FS::Path filename = *i / *j; + FS::Path filename = p / *j; if(FileTarget *tgt = get_target(filename)) { - builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type())); + builder.get_logger().log("vfs", format("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())); + builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str())); if(cur_names==&shared_names) { - /* XXX Hack: create ImportLibraries here; they should be handled - separately, but I need a more generic way of handling all these - filename patterns */ - if(FS::extpart(*j)==".a") + if(use_import_lib) return new ImportLibrary(builder, filename); return new SharedLibrary(builder, filename); } @@ -128,7 +133,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath } } - builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str())); + builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str())); } return 0; @@ -137,33 +142,38 @@ 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")) - { - vector parts = split(env_path, ':'); - for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - path.push_back(*i); - } + if(FS::Path(name).is_absolute()) + path.push_back("/"); else { - path.push_back("/bin"); - path.push_back("/usr/bin"); + string env_path = Msp::getenv("PATH"); + if(!env_path.empty()) + { + for(const string &p: split(env_path, ':')) + path.push_back(p); + } + else + { + path.push_back("/bin"); + path.push_back("/usr/bin"); + } } - for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i) + for(const FS::Path &p: path) { - FS::Path filename = *i/name; + FS::Path filename = p/name; if(FileTarget *tgt = get_target(filename)) { - builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, *i, tgt->get_type())); + builder.get_logger().log("vfs", format("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", format("Binary %s found in %s", name, *i)); + builder.get_logger().log("vfs", format("Binary %s found in %s", name, p)); return new Executable(builder, filename); } - builder.get_logger().log("vfs", format("Binary %s not found in %s", name, *i)); + builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p)); } return 0;