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 f24dd0786ea5f314ead5821735d122b98fa120e3..70410355652ab34cb7d522d0100ef62e30462eff 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -6,11 +6,13 @@ Distributed under the LGPL
 */
 
 #include <fstream>
+#include <iostream>
+#include <msp/fs/utils.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -26,23 +28,48 @@ from Builder.
 */
 void SourceFile::find_depends()
 {
-       ifstream in(name.c_str());
-       if(!in) return;
+       if(!comp)
+               return;
 
-       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+       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;
 
-       string line;
-       while(getline(in, line))
-               if(RegMatch match=r_include.match(line))
-                       includes.push_back(match[1].str);
+               if(builder.get_verbose()>=4)
+                       cout<<"Reading includes from "<<name<<'\n';
+
+               Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+
+               string line;
+               while(getline(in, line))
+                       if(RegMatch match=r_include.match(line))
+                               includes.push_back(match[1].str);
+
+               deps_cache.set_deps(relname, includes);
+       }
 
        const StringList &incpath=comp->get_build_info().incpath;
-       const string &arch=comp->get_package().get_arch();
 
        string path=name.substr(0, name.rfind('/'));
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr=builder.get_header(*i, arch, path, incpath);
+               Target *hdr=builder.get_header(*i, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }