X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=718a09c48541152d3c15f484b5048ce81017f94e;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=c4eea79eee84fa2b4c76d18c5f8e3619746513d9;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index c4eea79..718a09c 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,14 +1,20 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <fstream>
-#include <msp/regex++/regex++.h>
+#include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
 	Target(b, c?&c->get_package():0, n),
 	comp(c)
@@ -20,20 +26,34 @@ from Builder.
 */
 void SourceFile::find_depends()
 {
-	ifstream in(name.c_str());
-	if(!in) return;
+	if(!comp)
+		return;
 
-	Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+	DependencyCache &deps_cache=comp->get_package().get_deps_cache();
+	if(mtime>deps_cache.get_mtime())
+	{
+		ifstream in(name.c_str());
+		if(!in) return;
+
+		Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+
+		string line;
+		while(getline(in, line))
+			if(RegMatch match=r_include.match(line))
+				includes.push_back(match[1].str);
+
+		deps_cache.set_deps(name, includes);
+	}
+	else
+		includes=deps_cache.get_deps(name);
 
-	string line;
-	while(getline(in, line))
-		if(RegMatch match=r_include.match(line))
-			includes.push_back(match[1].str());
+	const StringList &incpath=comp->get_build_info().incpath;
+	const string &arch=comp->get_package().get_arch();
 
 	string path=name.substr(0, name.rfind('/'));
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr=builder.get_header(*i, path, comp->get_build_info().incpath);
+		Target *hdr=builder.get_header(*i, arch, path, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}