X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=062665c22d2fda44636d1c591eba55a3c01deb8e;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=7425a0f132c893c0448d0954993c1bde0321262f;hpb=1fdef3ec9d6291af8a467ea0e2c90e7f19141ae2;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 7425a0f..062665c 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
 #include <msp/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
@@ -31,22 +24,22 @@ void SourceFile::find_depends()
 {
 	if(!comp)
 	{
-		deps_ready=true;
+		deps_ready = true;
 		return;
 	}
 
-	const SourcePackage &spkg=comp->get_package();
-	string relname=FS::relative(name, spkg.get_source()).str();
-	DependencyCache &deps_cache=spkg.get_deps_cache();
-	bool deps_found=false;
+	const SourcePackage &spkg = comp->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;
+			includes = deps_cache.get_deps(relname);
+			deps_found = true;
 		}
-		catch(const KeyError &)
+		catch(const key_error &)
 		{ }
 	}
 
@@ -54,36 +47,38 @@ void SourceFile::find_depends()
 	{
 		try
 		{
-			IO::BufferedFile in(name);
+			IO::BufferedFile in(path.str());
 
 			if(builder.get_verbose()>=4)
-				IO::print("Reading includes from %s\n", name);
+				IO::print("Reading includes from %s\n", path.str());
 
 			Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
 			string line;
 			while(in.getline(line))
-				if(RegMatch match=r_include.match(line))
+				if(RegMatch match = r_include.match(line))
 					includes.push_back(match[1].str);
 
 			deps_cache.set_deps(relname, includes);
 		}
-		catch(const IO::FileNotFound &)
+		catch(const IO::file_not_found &)
 		{
-			// XXX WTF?
+			if(builder.get_verbose()>=4)
+				IO::print("Failed to read includes from %s\n", path.str());
+			deps_ready = true;
 			return;
 		}
 	}
 
-	const StringList &incpath=comp->get_build_info().incpath;
+	const StringList &incpath = comp->get_build_info().incpath;
 
-	FS::Path dir=FS::dirname(path);
+	FS::Path dir = FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr=builder.get_header(*i, dir, incpath);
+		Target *hdr = builder.get_vfs().find_header(*i, dir, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}
 
-	deps_ready=true;
+	deps_ready = true;
 }