X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=e34ff279cc4c98d199b491c075e17bc4c689a449;hb=1c42eb92bc1f07baecbb8752e532608426621c05;hp=0ff4286c5cb87bb6270a5978c304c8969c29bed0;hpb=ca18323d45d67243773b03668e79c715aa976441;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 0ff4286..e34ff27 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,52 +11,64 @@ using namespace std;
 using namespace Msp;
 
 CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-	SourceFile(b, 0, p)
+	SourceFile(b, p)
 { }
 
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
-	SourceFile(b, &c, p)
+	SourceFile(b, c, p)
 {
 	string ext = FS::extpart(FS::basename(path));
 	if(ext==".h" || ext==".H" || ext==".hpp")
-		install_location = "include/"+comp->get_name();
+		install_location = FS::Path("include")/package->get_name();
 }
 
-void CSourceFile::find_depends()
+void CSourceFile::parse_includes(IO::Base &in)
 {
-	if(!comp || !mtime)
+	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 = comp->get_package();
-	string relname = FS::relative(path, spkg.get_source()).str();
+	const SourcePackage &spkg = component->get_package();
 
-	DependencyCache &deps_cache = spkg.get_deps_cache();
-	if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
-		includes = deps_cache.get_deps(relname);
+	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(relname, includes);
+		parse_includes(in);
+		cache.set_values(this, "includes", includes);
 	}
 
-	const BuildInfo::PathList &incpath = comp->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)
+	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));
 		if(hdr)
-			add_depend(hdr);
+			add_dependency(*hdr);
 	}
 }
+
+void CSourceFile::modified()
+{
+	includes.clear();
+	depends.clear();
+	find_dependencies();
+}