Check DataTransform's directory mtime against cache mtime

[builder.git] / source / datatransform.cpp

diff --git a/source/datatransform.cpp b/source/datatransform.cpp
index 67b892ede81de5f8ce1fda4db26dfff666870a35..2f7e8754b66da94d57eda264608b745f346e8ba3 100644 (file)
--- a/source/datatransform.cpp
+++ b/source/datatransform.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/regex.h>
@@ -16,27 +17,38 @@ DataTransform::DataTransform(Builder &b, const Component &c, const FS::Path &p):
        FileTarget(b, c.get_package(), p)
 {
        component = &c;
+
+       if(FS::Stat st = FS::lstat(FS::dirname(path)))
+               dir_mtime = st.get_modify_time();
 }
 
 void DataTransform::find_dependencies()
 {
        list<string> files;
        Cache &cache = component->get_package().get_cache();
-       // XXX Should check directory mtime as well
-       if(mtime<cache.get_mtime() && cache.has_key(this, "files"))
+       const Time::TimeStamp &cache_mtime = cache.get_mtime();
+       if(mtime<cache_mtime && dir_mtime<cache_mtime && cache.has_key(this, "files"))
                files = cache.get_values(this, "files");
        else
        {
                builder.get_logger().log("files", format("Reading imports from %s", path.str()));
-
-               list<string> dir_files = list_files(FS::dirname(path));
                IO::File in(path.str());
                DataFile::Parser parser(in, path.str());
+
+               list<string> dir_files;
                while(!in.eof())
                {
                        DataFile::Statement st = parser.parse();
                        if(st.keyword=="for_each")
                        {
+                               // There's bound to be at least one file: the transform itself
+                               if(dir_files.empty())
+                               {
+                                       FS::Path dir = FS::dirname(path);
+                                       builder.get_logger().log("files", format("Traversing %s", dir.str()));
+                                       dir_files = list_files(dir);
+                               }
+
                                for(DataFile::Statement::Arguments::const_iterator i=st.args.begin(); i!=st.args.end(); ++i)
                                {
                                        Regex re(i->get<string>());
@@ -56,8 +68,8 @@ void DataTransform::find_dependencies()
        {
                FS::Path file_path = FS::dirname(path)/ *i;
                if(Target *tgt = builder.get_vfs().get_target(file_path))
-                       add_dependency(*tgt);
+                       add_transitive_dependency(*tgt);
                else
-                       add_dependency(*new File(builder, *package, file_path));
+                       add_transitive_dependency(*new File(builder, *package, file_path));
        }
 }