using namespace std;
using namespace Msp;
-VirtualFileSystem::VirtualFileSystem(Builder &b):
- builder(b)
-{
-}
-
FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
{
auto i = targets.find(p.str());
{
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, Tool *tool, const SearchPath &path, bool use_syspath)
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, p.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, p.str()));
+ builder.get_logger().log("vfs", "Header %s found in %s", name, p.str());
return dynamic_cast<FileTarget *>(tool->create_source(filename));
}
- builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
+ builder.get_logger().log("vfs", "Header %s not found in %s", name, p.str());
}
return 0;
const Architecture &arch = builder.get_current_arch();
- list<string> shared_names;
+ vector<string> shared_names;
bool use_import_lib = false;
if(mode!=BuildInfo::FORCE_STATIC)
{
shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
}
- list<string> static_names;
+ vector<string> static_names;
if(mode!=BuildInfo::FORCE_DYNAMIC)
static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
for(const FS::Path &p: combined_path)
{
- const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
+ const vector<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
for(auto j=cur_names->begin(); j!=cur_names->end(); )
{
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, p.str(), tgt->get_type()));
+ 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, p.str()));
+ builder.get_logger().log("vfs", "Library %s (%s) found in %s", lib, *j, p.str());
if(cur_names==&shared_names)
{
if(use_import_lib)
}
}
- builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
+ builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str());
}
return 0;
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, p, tgt->get_type()));
+ 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", format("Binary %s found in %s", name, p));
+ builder.get_logger().log("vfs", "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, p));
+ builder.get_logger().log("vfs", "Binary %s not found in %s", name, p);
}
return 0;