X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=cccc16945f6c74db42750a0c80e4eaac32000bf7;hb=b067981c0da0c1a4616ed175d0ce8ac5564cbdbf;hp=be646cdbb9c494afab313bd46ef56fb5add140d3;hpb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index be646cd..cccc169 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,27 +1,20 @@
+#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 "executable.h"
 #include "misc.h"
 #include "sharedlibrary.h"
-#include "systemlibrary.h"
+#include "staticlibrary.h"
+#include "tool.h"
 #include "virtualfilesystem.h"
 
 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)
 {
@@ -38,170 +31,147 @@ 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 &include, const FS::Path &from, const list<string> &path)
+FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath &path)
 {
-	string hash(8, 0);
-	if(include[0]=='\"')
-		update_hash(hash, from.str());
-	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-		update_hash(hash, *i);
-
-	string id = hash+include;
-	TargetMap::iterator i = include_cache.find(id);
-	if(i!=include_cache.end())
-		return i->second;
-
-	static string cxx_ver;
-	if(cxx_ver.empty())
+	// 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)
+		return 0;
+	const Tool::SearchPath &syspath = tool->get_system_path();
+
+	list<FS::Path> combined_path(path.begin(), path.end());
+	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)
 	{
-		// XXX This needs to go elsewhere
-		/*StringList argv;
-		argv.push_back(current_arch->get_tool("CXX"));
-		argv.push_back("--version");
-		if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv)))
+		FS::Path filename = *i/name;
+		if(FileTarget *tgt = get_target(filename))
 		{
-			cxx_ver = m[0].str;
-			while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
-			{
-				string::size_type dot = cxx_ver.rfind('.');
-				if(dot==string::npos)
-					break;
-				cxx_ver.erase(dot);
-			}
-			if(verbose>=5)
-				IO::print("C++ version is %s\n", cxx_ver);
+			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));
 		}
-		else*/
-			cxx_ver = "-";
-	}
-
-	string fn = include.substr(1);
-	if(builder.get_verbose()>=5)
-		IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
-
-	SearchPath syspath;
-	const Architecture &arch = builder.get_current_arch();
-	if(arch.is_native())
-		syspath.push_back("/usr/include");
-	else
-		syspath.push_back("/usr/"+arch.get_cross_prefix()+"/include");
-	if(cxx_ver!="-")
-		syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
-
-	FileTarget *tgt = 0;
-	if(include[0]=='\"')
-		tgt = get_header(FS::Path(from)/fn);
-	for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-		tgt = get_header(FS::Path(*j)/fn);
-	for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt = get_header(FS::Path(*j)/fn);
 
-	include_cache.insert(TargetMap::value_type(id, tgt));
+		builder.get_logger().log("vfs", format("Header %s not found in %s", name, i->str()));
+	}
 
-	return tgt;
+	return 0;
 }
 
-FileTarget *VirtualFileSystem::find_library(const string &lib, const list<string> &path, LibMode mode)
+FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, LibMode mode)
 {
-	string hash(8, 0);
-	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-		update_hash(hash, *i);
+	const Tool &linker = builder.get_toolchain().get_tool("LINK");
+	const Tool::SearchPath &syspath = linker.get_system_path();
 
-	string id = hash+string(1, mode)+lib;
-	TargetMap::iterator i = library_cache.find(id);
-	if(i!=library_cache.end())
-		return i->second;
+	list<FS::Path> combined_path(path.begin(), path.end());
+	combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
 
-	SearchPath syspath;
 	const Architecture &arch = builder.get_current_arch();
-	if(arch.is_native())
+
+	/* Try dynamic libraries only if library mode permits it */
+	list<string> shared_names;
+	if(mode!=ALL_STATIC)
 	{
-		syspath.push_back("/lib");
-		syspath.push_back("/usr/lib");
-		if(arch.match_name("pc-32-linux"))
-			syspath.push_back("/usr/lib/i386-linux-gnu");
-		else if(arch.match_name("pc-64-linux"))
-			syspath.push_back("/usr/lib/x86_64-linux-gnu");
+		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));
 	}
-	else
-		syspath.push_back("/usr/"+arch.get_cross_prefix()+"/lib");
-
-	if(builder.get_verbose()>=5)
-		IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
 
-	FileTarget *tgt = 0;
-	for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-		tgt = get_library(lib, *j, mode);
-	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt = get_library(lib, *j, mode);
+	/* Static libraries are always considered, since sometimes shared versions
+	may not be available */
+	list<string> static_names;
+	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));
 
-	library_cache.insert(TargetMap::value_type(id, tgt));
+	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
+	{
+		bool shared = true;
+		for(list<string>::const_iterator j=shared_names.begin(); j!=static_names.end(); )
+		{
+			if(j==shared_names.end())
+			{
+				j = static_names.begin();
+				shared = false;
+				continue;
+			}
 
-	return tgt;
-}
+			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;
+				}
+			}
+			else if(file_exists(filename))
+			{
+				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
+				if(shared)
+					return new SharedLibrary(builder, filename);
+				else
+					return new StaticLibrary(builder, filename);
+			}
 
-FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
-{
-	FileTarget *tgt = get_target(fn);
-	if(tgt)
-		return tgt;
+			++j;
+		}
 
-	if(FS::is_reg(fn))
-	{
-		tgt = new CSourceFile(builder, fn);
-		return tgt;
+		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
 	}
+
 	return 0;
 }
 
-FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &path, LibMode mode)
+FileTarget *VirtualFileSystem::find_binary(const string &name)
 {
-	// Populate a list of candidate filenames
-	StringList candidates;
-
-	const Architecture &arch = builder.get_current_arch();
-	if(mode!=ALL_STATIC)
+	SearchPath path;
+	if(const char *env_path = getenv("PATH"))
 	{
-		// XXX Should probably let the Architecture populate the list
-		if(arch.get_system()=="windows")
-		{
-			candidates.push_back("lib"+lib+".dll");
-			candidates.push_back(lib+".dll");
-		}
-		else
-			candidates.push_back("lib"+lib+".so");
+		vector<string> parts = split(env_path, ':');
+		for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+			path.push_back(*i);
 	}
-
-	/* Static libraries are always considered, since sometimes shared versions
-	may not be available */
-	candidates.push_back("lib"+lib+".a");
-	if(arch.get_system()=="windows")
-		candidates.push_back("lib"+lib+".dll.a");
-
-	for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+	else
 	{
-		FS::Path full = path/ *i;
-		FileTarget *tgt = get_target(full);
+		path.push_back("/bin");
+		path.push_back("/usr/bin");
+	}
 
-		if(tgt)
+	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
+	{
+		FS::Path filename = *i/name;
+		if(FileTarget *tgt = get_target(filename))
 		{
-			Target *real_tgt = tgt->get_real_target();
-
-			/* Ignore dynamic libraries from local packages unless library mode is
-			DYNAMIC */
-			if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
-				continue;
-			else if(tgt)
-				return tgt;
+			builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, *i, tgt->get_type()));
+			return tgt;
 		}
-		else if(FS::is_reg(full))
+		else if(file_exists(filename))
 		{
-			tgt = new SystemLibrary(builder, full.str());
-			return tgt;
+			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))
+		return false;
+	if(FS::is_reg(filename))
+		return true;
+	nonexistent.insert(filename);
+	return false;
+}