X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=60867cf7a4feb3dda5638ee35c9b7a2a956e6d88;hb=c8dfe708b5551818dad3f6cf3e86cc72fe684572;hp=0dc8de604ffd4253e4ae51e4920ef4c95dd09d0a;hpb=2f1e3b296bb8a2c4fcb73d7339cf7d0d6f9d1459;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 0dc8de6..60867cf 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,9 +1,11 @@
+#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 "staticlibrary.h"
@@ -64,7 +66,7 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath
 	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)
 {
 	const Tool &linker = builder.get_toolchain().get_tool("LINK");
 	const Tool::SearchPath &syspath = linker.get_system_path();
@@ -74,38 +76,31 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 
 	const Architecture &arch = builder.get_current_arch();
 
-	/* Try dynamic libraries only if library mode permits it */
 	list<string> shared_names;
-	if(mode!=ALL_STATIC)
+	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));
 	}
 
-	/* 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));
+	if(mode!=BuildInfo::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));
+	}
 
 	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(); )
+		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(); )
 		{
-			if(j==shared_names.end())
-			{
-				j = static_names.begin();
-				shared = false;
-				continue;
-			}
-
 			FS::Path filename = *i / *j;
 			if(FileTarget *tgt = get_target(filename))
 			{
-				if(!shared || mode==DYNAMIC || !tgt->get_package())
+				if(cur_names!=&shared_names || mode==BuildInfo::DYNAMIC)
 				{
 					builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
 					return tgt;
@@ -114,13 +109,22 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 			else if(file_exists(filename))
 			{
 				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
-				if(shared)
+				if(cur_names==&shared_names)
 					return new SharedLibrary(builder, filename);
 				else
 					return new StaticLibrary(builder, filename);
 			}
 
-			++j;
+			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();
+			}
 		}
 
 		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, i->str()));
@@ -129,6 +133,41 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	return 0;
 }
 
+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);
+	}
+	else
+	{
+		path.push_back("/bin");
+		path.push_back("/usr/bin");
+	}
+
+	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)
+	{
+		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 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;
+}
+
 bool VirtualFileSystem::file_exists(const FS::Path &filename)
 {
 	if(nonexistent.count(filename))