Load builderrc from sys_data_dir to avoid the need of copying it to $HOME

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index af1c04a5cf4205be339b86a1e9cead91f8a02f90..70410355652ab34cb7d522d0100ef62e30462eff 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <fstream>
 #include <iostream>
+#include <msp/fs/utils.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -30,8 +31,22 @@ void SourceFile::find_depends()
        if(!comp)
                return;
 
-       DependencyCache &deps_cache=comp->get_package().get_deps_cache();
-       if(mtime>deps_cache.get_mtime())
+       const SourcePackage &spkg=comp->get_package();
+       string relname=FS::relative(name, spkg.get_source()).str();
+       DependencyCache &deps_cache=spkg.get_deps_cache();
+       bool deps_found=false;
+       if(mtime<deps_cache.get_mtime())
+       {
+               try
+               {
+                       includes=deps_cache.get_deps(relname);
+                       deps_found=true;
+               }
+               catch(const KeyError &)
+               { }
+       }
+
+       if(!deps_found)
        {
                ifstream in(name.c_str());
                if(!in) return;
@@ -46,10 +61,8 @@ void SourceFile::find_depends()
                        if(RegMatch match=r_include.match(line))
                                includes.push_back(match[1].str);
 
-               deps_cache.set_deps(name, includes);
+               deps_cache.set_deps(relname, includes);
        }
-       else
-               includes=deps_cache.get_deps(name);
 
        const StringList &incpath=comp->get_build_info().incpath;