Add DependencyCache to speed up build preparation

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 949bd8e7755b6c7b0a0a348624b3b709b612c7c1..8fb2b4dde4ffe8dda0e0b2507aca1174ca7ee968 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -26,9 +26,12 @@ Package::Package(Builder &b, const string &n, const Path::Path &s):
        source(s),
        config(*this),
        conf_done(false),
+       deps_cache(*this),
        use_pkgconfig(true),
        need_path(false)
 {
+       tar_files.push_back(source/"Build");
+
        if(builder.get_verbose()>=4)
                cout<<"Created buildable package "<<n<<" at "<<s<<'\n';
 }
@@ -165,6 +168,8 @@ void Package::configure(const StringMap &opts, unsigned flag)
                                (*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
                        (*i)->configure(opts, flag&2);
                }
+
+               deps_cache.load();
        }
 
        create_build_info();
@@ -223,7 +228,8 @@ Package::Package(Builder &b, const string &n, const vector<string> &info):
        name(n),
        buildable(false),
        config(*this),
-       conf_done(false)
+       conf_done(false),
+       deps_cache(*this)
 {
        for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
        {
@@ -356,6 +362,7 @@ void Package::create_build_info()
        export_binfo.unique();
 }
 
+
 Package::Loader::Loader(Package &p):
        pkg(p)
 {
@@ -369,6 +376,7 @@ Package::Loader::Loader(Package &p):
        add("module",      &Loader::module);
        add("headers",     &Loader::headers);
        add("build_info",  &Loader::build_info);
+       add("tar_file",    &Loader::tar_file);
 }
 
 void Package::Loader::require(const string &n)
@@ -420,3 +428,8 @@ void Package::Loader::build_info()
 {
        load_sub(pkg.build_info);
 }
+
+void Package::Loader::tar_file(const string &f)
+{
+       pkg.tar_files.push_back(pkg.source/f);
+}