From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 4 Oct 2016 14:42:18 +0000 (+0300)
Subject: Check DataTransform's directory mtime against cache mtime
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bbd0fd0a91c80a9f2a88992e05f7bb36c0985dca;p=builder.git

Check DataTransform's directory mtime against cache mtime

Transforms commonly contain wildcard patterns, so the set of source files
may change without the transform itself changing.
---

diff --git a/source/datatransform.cpp b/source/datatransform.cpp
index e45c80a..2f7e875 100644
--- 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,14 +17,17 @@ 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
 	{
diff --git a/source/datatransform.h b/source/datatransform.h
index 38e559b..b39eacd 100644
--- a/source/datatransform.h
+++ b/source/datatransform.h
@@ -5,6 +5,9 @@
 
 class DataTransform: public FileTarget
 {
+private:
+	Msp::Time::TimeStamp dir_mtime;
+
 public:
 	DataTransform(Builder &, const Component &, const Msp::FS::Path &);