X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=3c3aad935f965e7c039ad68bbe3d7419afb832f6;hb=6f76342d14c7b7ec7b9629fcfd40199bca1e5e0f;hp=2162cf0873ee1f7b9fd9a43a82649c2b47a4ba05;hpb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 2162cf0..3c3aad9 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,76 +11,52 @@ using namespace std;
 using namespace Msp;
 
 CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-	SourceFile(b, 0, p)
+	SourceFile(b, p)
 { }
 
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
-	SourceFile(b, &c, p)
+	SourceFile(b, c, p)
 {
 	string ext = FS::extpart(FS::basename(path));
 	if(ext==".h" || ext==".H" || ext==".hpp")
-		install_location = "include/"+comp->get_name();
+		install_location = FS::Path("include")/component->get_name();
 }
 
 void CSourceFile::find_depends()
 {
-	if(!comp)
-	{
-		deps_ready = true;
+	if(!component || !mtime)
 		return;
-	}
 
-	const SourcePackage &spkg = comp->get_package();
+	const SourcePackage &spkg = component->get_package();
 	string relname = FS::relative(path, spkg.get_source()).str();
-	DependencyCache &deps_cache = spkg.get_deps_cache();
-	bool deps_found = false;
-	if(mtime<deps_cache.get_mtime())
-	{
-		try
-		{
-			includes = deps_cache.get_deps(relname);
-			deps_found = true;
-		}
-		catch(const key_error &)
-		{ }
-	}
 
-	if(!deps_found)
+	DependencyCache &deps_cache = spkg.get_deps_cache();
+	if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
+		includes = deps_cache.get_deps(relname);
+	else
 	{
-		try
-		{
-			IO::BufferedFile in(path.str());
+		IO::BufferedFile in(path.str());
 
-			if(builder.get_verbose()>=4)
-				IO::print("Reading includes from %s\n", path.str());
+		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
-			Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+		Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
-			string line;
-			while(in.getline(line))
-				if(RegMatch match = r_include.match(line))
-					includes.push_back(match[1].str);
+		string line;
+		while(in.getline(line))
+			if(RegMatch match = r_include.match(line))
+				includes.push_back(match[1].str);
 
-			deps_cache.set_deps(relname, includes);
-		}
-		catch(const IO::file_not_found &)
-		{
-			if(builder.get_verbose()>=4)
-				IO::print("Failed to read includes from %s\n", path.str());
-			deps_ready = true;
-			return;
-		}
+		deps_cache.set_deps(relname, includes);
 	}
 
-	const StringList &incpath = comp->get_build_info().incpath;
+	const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+	BuildInfo::PathList local_incpath = incpath;
+	local_incpath.push_front(FS::dirname(path).str());
 
-	FS::Path dir = FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr = builder.get_vfs().find_header(*i, dir, incpath);
+		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
 			add_depend(hdr);
 	}
-
-	deps_ready = true;
 }