X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=58e1a7b575fc8cc64306c3ecbaea27b4a688aaca;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=7de9b797761717ce968649931e29ea6a32b8920c;hpb=c8dfe708b5551818dad3f6cf3e86cc72fe684572;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 7de9b79..58e1a7b 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,10 +1,12 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -52,7 +54,6 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 	else if(FS::descendant_depth(path, builder.get_prefix())>=0)
 	{
 		FS::Path relpath = FS::relative(path, builder.get_prefix());
-		builder.get_logger().log("debug", format("%s %s %s", path, builder.get_prefix(), relpath));
 		return "<prefix>"+relpath.str().substr(1);
 	}
 
@@ -84,8 +85,27 @@ void FileTarget::check_rebuild()
 		}
 	}
 
-	if(!needs_rebuild() && package && package->get_config().get_mtime()>mtime)
-		mark_rebuild("Package options changed");
+	if(!needs_rebuild() && package)
+	{
+		if(package->get_config().get_mtime()>mtime)
+			mark_rebuild("Package options changed");
+
+		string build_sig = create_build_signature();
+		if(package->get_cache().has_key(this, "build_sig"))
+		{
+			if(package->get_cache().get_value(this, "build_sig")!=build_sig)
+				mark_rebuild("Build signature changed");
+		}
+	}
+}
+
+string FileTarget::create_build_signature() const
+{
+	if(!package)
+		return string();
+
+	const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
+	return tool->create_build_signature(binfo);
 }
 
 Task *FileTarget::build()
@@ -99,7 +119,15 @@ Task *FileTarget::build()
 void FileTarget::build_finished(bool success)
 {
 	if(success)
+	{
 		stat();
+		if(package)
+		{
+			string build_sig = create_build_signature();
+			if(!build_sig.empty())
+				package->get_cache().set_value(this, "build_sig", build_sig);
+		}
+	}
 
 	Target::build_finished(success);
 }