X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=36fe1c129190e83ebd7736e7557a2619d27e9db8;hp=0dc8de604ffd4253e4ae51e4920ef4c95dd09d0a;hb=650560b14cac4bb35589b5b8db99197c5e1345cc;hpb=2f1e3b296bb8a2c4fcb73d7339cf7d0d6f9d1459 diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp index 0dc8de6..36fe1c1 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" @@ -33,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 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::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i) { @@ -64,63 +71,66 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath 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()); + 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(); - /* Try dynamic libraries only if library mode permits it */ list shared_names; - if(mode!=ALL_STATIC) + 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)); + 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) { - bool shared = true; - for(list::const_iterator j=shared_names.begin(); j!=static_names.end(); ) + const list *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names); + for(list::const_iterator 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; 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", 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(shared) + 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", format("Library %s not found in %s", lib, i->str())); @@ -129,6 +139,43 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath return 0; } +FileTarget *VirtualFileSystem::find_binary(const string &name) +{ + SearchPath path; + if(FS::Path(name).is_absolute()) + path.push_back("/"); + else 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); + } + else + { + path.push_back("/bin"); + path.push_back("/usr/bin"); + } + + for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i) + { + FS::Path filename = *i/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())); + return tgt; + } + else if(file_exists(filename)) + { + builder.get_logger().log("vfs", format("Binary %s found in %s", name, *i)); + return new Executable(builder, filename); + } + + builder.get_logger().log("vfs", format("Binary %s not found in %s", name, *i)); + } + + return 0; +} + bool VirtualFileSystem::file_exists(const FS::Path &filename) { if(nonexistent.count(filename))