X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=0fc989d0f5a78927acce28f38050c0feddc7f09d;hb=409a427f912f9c203b102beed0816b53b250931f;hp=cf74356e72331e3f1a84c68f2afabc174f518d00;hpb=7edb751727a176f58da886c2424d4840a0a910fd;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index cf74356..0fc989d 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,13 +1,13 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
 #include <msp/fs/utils.h>
 #include <msp/io/except.h>
+#include <msp/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -17,30 +17,34 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
-	Target(b, c?&c->get_package():0, n),
-	comp(c)
+SourceFile::SourceFile(Builder &b, const FS::Path &p):
+	FileTarget(b, 0, p),
+	comp(0)
+{ }
+
+SourceFile::SourceFile(Builder &b, const Component &c, const FS::Path &p):
+	FileTarget(b, &c.get_package(), p),
+	comp(&c)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
 void SourceFile::find_depends()
 {
 	if(!comp)
+	{
+		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 &)
 		{ }
@@ -50,35 +54,38 @@ void SourceFile::find_depends()
 	{
 		try
 		{
-			IO::BufferedFile in(name);
+			IO::BufferedFile in(path.str());
 
 			if(builder.get_verbose()>=4)
-				cout<<"Reading includes from "<<name<<'\n';
+				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 &)
 		{
+			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;
 
-	string path=name.substr(0, name.rfind('/'));
+	FS::Path dir = FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr=builder.get_header(*i, path, incpath);
+		Target *hdr = builder.get_header(*i, dir, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}
 
-	deps_ready=true;
+	deps_ready = true;
 }