X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=af1c04a5cf4205be339b86a1e9cead91f8a02f90;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=42142536607b9a4540929703ae14383538823ea8;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 4214253..af1c04a 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,8 +1,17 @@
+/* $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 <iostream>
+#include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -12,29 +21,45 @@ SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
 	comp(c)
 { }
 
+/**
+Parses include directives from the file and looks up the appropriate targets
+from Builder.
+*/
 void SourceFile::find_depends()
 {
-	ifstream in(name.c_str());
-	if(!in) return;
+	if(!comp)
+		return;
+
+	DependencyCache &deps_cache=comp->get_package().get_deps_cache();
+	if(mtime>deps_cache.get_mtime())
+	{
+		ifstream in(name.c_str());
+		if(!in) return;
+
+		if(builder.get_verbose()>=4)
+			cout<<"Reading includes from "<<name<<'\n';
 
-	Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+		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());
+		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);
+
+	const StringList &incpath=comp->get_build_info().incpath;
 
 	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, path, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}
-}
 
-void SourceFile::check_rebuild()
-{
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
-		vmtime=max(vmtime, (*i)->get_virtual_mtime());
+	deps_ready=true;
 }