-#include <cstdlib>
+#include <msp/core/environ.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/print.h>
#include "builder.h"
#include "csourcefile.h"
#include "executable.h"
-#include "misc.h"
+#include "importlibrary.h"
#include "sharedlibrary.h"
#include "staticlibrary.h"
#include "tool.h"
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<FS::Path> 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<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
{
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<FS::Path> 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();
list<string> shared_names;
- if(mode!=FORCE_STATIC)
+ bool use_import_lib = false;
+ if(mode!=BuildInfo::FORCE_STATIC)
{
- const list<Pattern> &shared_patterns = arch.get_shared_library_patterns();
- for(list<Pattern>::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<ImportLibrary>(), lib);
+ if(!(use_import_lib = !shared_names.empty()))
+ shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
}
list<string> static_names;
- if(mode!=FORCE_DYNAMIC)
- {
- const list<Pattern> &static_patterns = arch.get_static_library_patterns();
- for(list<Pattern>::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<StaticLibrary>(), lib);
for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
{
- const list<string> *cur_names = (mode>=DYNAMIC ? &shared_names : &static_names);
+ 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(); )
{
FS::Path filename = *i / *j;
if(FileTarget *tgt = get_target(filename))
{
- if(cur_names!=&shared_names || 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(cur_names==&shared_names)
+ {
+ if(use_import_lib)
+ return new ImportLibrary(builder, filename);
return new SharedLibrary(builder, filename);
+ }
else
return new StaticLibrary(builder, filename);
}
if(++j==cur_names->end())
{
- if(mode==DYNAMIC && cur_names==&shared_names)
+ if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
cur_names = &static_names;
- else if(mode==STATIC && cur_names==&static_names)
+ else if(mode==BuildInfo::STATIC && cur_names==&static_names)
cur_names = &shared_names;
else
break;
FileTarget *VirtualFileSystem::find_binary(const string &name)
{
SearchPath path;
- 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);
- }
+ 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())
+ {
+ 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");
+ }
}
for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)