*/
#include <fstream>
+#include <iostream>
+#include <msp/fs/utils.h>
#include <msp/strings/regex.h>
#include "builder.h"
#include "component.h"
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;
+ if(builder.get_verbose()>=4)
+ cout<<"Reading includes from "<<name<<'\n';
+
Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
string line;
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;
- 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);
}