Replace DependencyCache with a more generic cache

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 5628e04adb0aed6310b015c2d0c228cac8c40f10..553128743d8651e50cd0195f4c868727e312c2c3 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -28,11 +28,10 @@ void CSourceFile::find_dependencies()
                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());
@@ -46,7 +45,7 @@ void CSourceFile::find_dependencies()
                        if(RegMatch match = r_include.match(line))
                                includes.push_back(match[1].str);
 
-               deps_cache.set_deps(deps_key, includes);
+               cache.set_values(this, "includes", includes);
        }
 
        const BuildInfo::PathList &incpath = component->get_build_info().incpath;