X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=820fb5b670bfc600a6df879bdc2c15f26ef39452;hb=f5413fd8f007164591af26be9ded15ee7c707540;hp=bff2886219ce7c4eb745083c749a896e2ad41674;hpb=9ab7e80ccd0a8043609d6a09f4119fa6e1d4ad9c;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index bff2886..820fb5b 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,10 +1,12 @@
+#include <cstdlib>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
 #include "csourcefile.h"
-#include "misc.h"
+#include "executable.h"
+#include "importlibrary.h"
 #include "sharedlibrary.h"
 #include "staticlibrary.h"
 #include "tool.h"
@@ -13,17 +15,6 @@
 using namespace std;
 using namespace Msp;
 
-namespace {
-
-void update_hash(string &hash, const string &value)
-{
-	for(unsigned i=0; i<value.size(); ++i)
-		hash[i%hash.size()] ^= value[i];
-}
-
-}
-
-
 VirtualFileSystem::VirtualFileSystem(Builder &b):
 	builder(b)
 {
@@ -40,121 +31,155 @@ 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));
+	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)
+FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
 {
-	string hash(8, 0);
-	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-		update_hash(hash, *i);
-
-	string id = hash+name;
-	TargetMap::iterator i = include_cache.find(id);
-	if(i!=include_cache.end())
-		return i->second;
-
-	if(builder.get_verbose()>=5)
-		IO::print("Looking for header %s with path %s\n", name, join(path.begin(), path.end()));
-
-	// 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();
 
-	FileTarget *tgt = 0;
-	for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-		tgt = get_header(FS::Path(*j)/name);
-	for(Tool::SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt = get_header(FS::Path(*j)/name);
+	tool->prepare();
 
-	include_cache.insert(TargetMap::value_type(id, tgt));
+	list<FS::Path> combined_path(path.begin(), path.end());
+	if(use_syspath)
+	{
+		const Tool::SearchPath &syspath = tool->get_system_path();
+		combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+	}
 
-	return tgt;
+	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+	{
+		FS::Path filename = *i/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()));
+			return tgt;
+		}
+		else if(file_exists(filename))
+		{
+			builder.get_logger().log("vfs", format("Header %s found in %s", name, i->str()));
+			return dynamic_cast<FileTarget *>(tool->create_source(filename));
+		}
+
+		builder.get_logger().log("vfs", format("Header %s not found in %s", name, i->str()));
+	}
+
+	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)
 {
-	string hash(8, 0);
-	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-		update_hash(hash, *i);
+	list<FS::Path> combined_path(path.begin(), path.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());
+	}
 
-	string id = hash+string(1, mode)+lib;
-	TargetMap::iterator i = library_cache.find(id);
-	if(i!=library_cache.end())
-		return i->second;
+	const Architecture &arch = builder.get_current_arch();
 
-	const Tool &linker = builder.get_toolchain().get_tool("LINK");
-	const Tool::SearchPath &syspath = linker.get_system_path();
+	list<string> shared_names;
+	if(mode!=BuildInfo::FORCE_STATIC)
+		shared_names = Pattern::apply_list(arch.get_shared_library_patterns(), lib);
 
-	if(builder.get_verbose()>=5)
-		IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
+	list<string> static_names;
+	if(mode!=BuildInfo::FORCE_DYNAMIC)
+		static_names = Pattern::apply_list(arch.get_static_library_patterns(), lib);
 
-	FileTarget *tgt = 0;
-	for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-		tgt = get_library(lib, *j, mode);
-	for(Tool::SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt = get_library(lib, *j, mode);
+	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+	{
+		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))
+			{
+				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)
+				{
+					/* 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")
+						return new ImportLibrary(builder, filename);
+					return new SharedLibrary(builder, filename);
+				}
+				else
+					return new StaticLibrary(builder, filename);
+			}
+
+			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();
+			}
+		}
 
-	library_cache.insert(TargetMap::value_type(id, tgt));
+		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
+	}
 
-	return tgt;
+	return 0;
 }
 
-FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
+FileTarget *VirtualFileSystem::find_binary(const string &name)
 {
-	FileTarget *tgt = get_target(fn);
-	if(tgt)
-		return tgt;
-
-	if(FS::is_reg(fn))
+	SearchPath path;
+	if(FS::Path(name).is_absolute())
+		path.push_back("/");
+	else if(const char *env_path = getenv("PATH"))
 	{
-		tgt = new CSourceFile(builder, fn);
-		return tgt;
+		vector<string> parts = split(env_path, ':');
+		for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+			path.push_back(*i);
 	}
-	return 0;
-}
-
-FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &path, LibMode mode)
-{
-	const Architecture &arch = builder.get_current_arch();
-
-	/* Try dynamic libraries only if library mode permits it */
-	if(mode!=ALL_STATIC)
+	else
 	{
-		FS::Path fn = try_patterns(path, arch.get_shared_library_patterns(), lib);
-		if(!fn.empty())
-		{
-			FileTarget *tgt = get_target(fn);
-			if(!tgt)
-				return new SharedLibrary(builder, fn);
-			else if(mode==DYNAMIC || !tgt->get_package())
-				return tgt;
-		}
+		path.push_back("/bin");
+		path.push_back("/usr/bin");
 	}
 
-	/* Static libraries are always considered, since sometimes shared versions
-	may not be available */
-	FS::Path fn = try_patterns(path, arch.get_static_library_patterns(), lib);
-	if(!fn.empty())
+	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
 	{
-		if(FileTarget *tgt = get_target(fn))
+		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
-			return new StaticLibrary(builder, fn);
+		}
+		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;
 }
 
-FS::Path VirtualFileSystem::try_patterns(const FS::Path &dir, const list<Pattern> &patterns, const string &base)
+bool VirtualFileSystem::file_exists(const FS::Path &filename)
 {
-	for(list<Pattern>::const_iterator i=patterns.begin(); i!=patterns.end(); ++i)
-	{
-		FS::Path full = dir/i->apply(base);
-		if(get_target(full) || FS::is_reg(full))
-			return full;
-	}
-
-	return FS::Path();
+	if(nonexistent.count(filename))
+		return false;
+	if(FS::is_reg(filename))
+		return true;
+	nonexistent.insert(filename);
+	return false;
 }