X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=0034ebd0e564870c6ed101835f52cd130ef42506;hb=69cd5cc73f466181420711fb907979de58687a4c;hp=5628e04adb0aed6310b015c2d0c228cac8c40f10;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 5628e04..0034ebd 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,6 +6,7 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -22,41 +23,56 @@ CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
 		install_location = FS::Path("include")/package->get_name();
 }
 
+void CSourceFile::parse_includes(IO::Base &in)
+{
+	static 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);
+}
+
 void CSourceFile::find_dependencies()
 {
 	if(!component || !mtime)
 		return;
 
 	const SourcePackage &spkg = component->get_package();
-	string deps_key = FS::relative(path, spkg.get_source_directory()).str();
 
-	DependencyCache &deps_cache = spkg.get_dependency_cache();
-	if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(deps_key))
-		includes = deps_cache.get_deps(deps_key);
+	Cache &cache = spkg.get_cache();
+	if(mtime<cache.get_mtime() && cache.has_key(this, "includes"))
+		includes = cache.get_values(this, "includes");
 	else
 	{
 		IO::BufferedFile in(path.str());
 
 		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
-		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);
-
-		deps_cache.set_deps(deps_key, includes);
+		parse_includes(in);
+		cache.set_values(this, "includes", includes);
 	}
 
-	const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+	const BuildInfo &build_info = component->get_build_info_for_path(path);
+	const BuildInfo::PathList &incpath = build_info.incpath;
 	BuildInfo::PathList local_incpath = incpath;
+	local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
 	local_incpath.push_front(FS::dirname(path).str());
 
-	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
+	Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+	if(compiler)
+		compiler->prepare();
+	for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
+		Target *hdr = builder.get_vfs().find_header(i->substr(1), compiler, ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
-			add_dependency(*hdr);
+			add_transitive_dependency(*hdr);
 	}
 }
+
+void CSourceFile::modified()
+{
+	includes.clear();
+	trans_depends.clear();
+	find_dependencies();
+}