X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=5628e04adb0aed6310b015c2d0c228cac8c40f10;hb=c63d5e1c1a1b3c095a94d1e21a302aaa694dd656;hp=d3cb807a781cc1f35cefafa8ece08079ee126f94;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index d3cb807..5628e04 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,28 +11,28 @@ 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::find_dependencies()
 {
-	if(!comp || !mtime)
+	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();
+	string deps_key = FS::relative(path, spkg.get_source_directory()).str();
 
-	DependencyCache &deps_cache = spkg.get_deps_cache();
-	if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
-		includes = deps_cache.get_deps(relname);
+	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);
 	else
 	{
 		IO::BufferedFile in(path.str());
@@ -46,17 +46,17 @@ void CSourceFile::find_depends()
 			if(RegMatch match = r_include.match(line))
 				includes.push_back(match[1].str);
 
-		deps_cache.set_deps(relname, includes);
+		deps_cache.set_deps(deps_key, includes);
 	}
 
-	const StringList &incpath = comp->get_build_info().incpath;
-	StringList local_incpath = incpath;
+	const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+	BuildInfo::PathList local_incpath = incpath;
 	local_incpath.push_front(FS::dirname(path).str());
 
 	for(list<string>::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);
 	}
 }