X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=75f935d505e4c4388c9d1073c1de0ec7a01786a6;hb=dceec8d95c63aaf4d8d4b367c9846caf9e32a6bf;hp=ef7605b14b929fc8cbb4eea0f87a66ab48f89201;hpb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index ef7605b..75f935d 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -5,7 +5,7 @@
 #include "csourcefile.h"
 #include "misc.h"
 #include "sharedlibrary.h"
-#include "systemlibrary.h"
+#include "staticlibrary.h"
 #include "virtualfilesystem.h"
 
 using namespace std;
@@ -40,15 +40,13 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 	targets.insert(TargetMap::value_type(path.str(), t));
 }
 
-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;
+	string id = hash+name;
 	TargetMap::iterator i = include_cache.find(id);
 	if(i!=include_cache.end())
 		return i->second;
@@ -77,9 +75,8 @@ FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path
 			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()));
+		IO::print("Looking for header %s with path %s\n", name, join(path.begin(), path.end()));
 
 	SearchPath syspath;
 	const Architecture &arch = builder.get_current_arch();
@@ -91,12 +88,10 @@ FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path
 		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);
+	for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
+		tgt = get_header(FS::Path(*j)/name);
+	for(SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+		tgt = get_header(FS::Path(*j)/name);
 
 	include_cache.insert(TargetMap::value_type(id, tgt));
 
@@ -158,45 +153,44 @@ FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
 
 FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &path, LibMode mode)
 {
-	// Populate a list of candidate filenames
-	StringList candidates;
-
 	const Architecture &arch = builder.get_current_arch();
-	if(mode!=ALL_STATIC)
-		fill_candidates(candidates, arch.get_shared_library_patterns(), lib);
-
-	/* Static libraries are always considered, since sometimes shared versions
-	may not be available */
-	fill_candidates(candidates, arch.get_static_library_patterns(), lib);
 
-	for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+	/* Try dynamic libraries only if library mode permits it */
+	if(mode!=ALL_STATIC)
 	{
-		FS::Path full = path/ *i;
-		FileTarget *tgt = get_target(full);
-
-		if(tgt)
+		FS::Path fn = try_patterns(path, arch.get_shared_library_patterns(), lib);
+		if(!fn.empty())
 		{
-			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)
+			FileTarget *tgt = get_target(fn);
+			if(!tgt)
+				return new SharedLibrary(builder, fn);
+			else if(mode==DYNAMIC || !tgt->get_package())
 				return tgt;
 		}
-		else if(FS::is_reg(full))
-		{
-			tgt = new SystemLibrary(builder, full.str());
+	}
+
+	/* 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())
+	{
+		if(FileTarget *tgt = get_target(fn))
 			return tgt;
-		}
+		else
+			return new StaticLibrary(builder, fn);
 	}
 
 	return 0;
 }
 
-void VirtualFileSystem::fill_candidates(StringList &candidates, const list<Pattern> &patterns, const string &base)
+FS::Path VirtualFileSystem::try_patterns(const FS::Path &dir, const list<Pattern> &patterns, const string &base)
 {
 	for(list<Pattern>::const_iterator i=patterns.begin(); i!=patterns.end(); ++i)
-		candidates.push_back(i->apply(base));
+	{
+		FS::Path full = dir/i->apply(base);
+		if(get_target(full) || FS::is_reg(full))
+			return full;
+	}
+
+	return FS::Path();
 }