-#include <cstdlib>
+#include <msp/core/environ.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/print.h>
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<FileTarget *>(i->second);
return 0;
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 Tool *tool, const SearchPath &path, bool use_syspath)
+FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
{
if(!tool)
tool = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(name)), true);
if(!tool)
return 0;
- list<FS::Path> combined_path(path.begin(), path.end());
+ tool->prepare();
+
+ SearchPath combined_path = path;
if(use_syspath)
{
- const Tool::SearchPath &syspath = tool->get_system_path();
+ const SearchPath &syspath = tool->get_system_path();
combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
}
- for(list<FS::Path>::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<FileTarget *>(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, BuildInfo::LibraryMode mode, bool use_syspath)
{
- list<FS::Path> combined_path(path.begin(), path.end());
+ SearchPath combined_path = path;
if(use_syspath)
{
- const Tool &linker = builder.get_toolchain().get_tool("LINK");
- const Tool::SearchPath &syspath = linker.get_system_path();
+ 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();
- 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_shared_library_patterns(), lib);
+ {
+ shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+ if(!(use_import_lib = !shared_names.empty()))
+ 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_static_library_patterns(), lib);
+ static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
- for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+ for(const FS::Path &p: combined_path)
{
- const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
- for(list<string>::const_iterator j=cur_names->begin(); j!=cur_names->end(); )
+ 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 = *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", "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", "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);
}
}
}
- builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
+ builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str());
}
return 0;
SearchPath path;
if(FS::Path(name).is_absolute())
path.push_back("/");
- else if(const char *env_path = getenv("PATH"))
- {
- vector<string> parts = split(env_path, ':');
- for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
- path.push_back(*i);
- }
else
{
- path.push_back("/bin");
- path.push_back("/usr/bin");
+ 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(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", "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", "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", "Binary %s not found in %s", name, p);
}
return 0;
projects / builder.git / blobdiff