X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=51a92d13b1a11f61c34671a1d8c39adfa710bdcc;hb=407b96515a5246384847d1835a2d69704e941ea1;hp=1f25cd1a9818a283c9e74ba4705d3df2dafd9faa;hpb=03227882aef8b448065e6ca9cda9b7722b7a9753;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 1f25cd1..51a92d1 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -6,6 +6,7 @@
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "task.h"
 #include "tool.h"
 
 using namespace std;
@@ -29,6 +30,8 @@ void FileTarget::init(const SourcePackage *p)
 {
 	size = 0;
 	package = p;
+	nested_build_sig = false;
+	arch_in_build_sig = false;
 
 	builder.get_vfs().register_path(path, this);
 
@@ -54,7 +57,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);
 	}
 
@@ -64,12 +66,13 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 void FileTarget::touch()
 {
 	mtime = Time::now();
+	modified();
 	signal_bubble_rebuild.emit();
 }
 
 void FileTarget::check_rebuild()
 {
-	if(!tool)
+	if(!tool || needs_rebuild())
 		return;
 
 	if(!mtime)
@@ -86,16 +89,27 @@ void FileTarget::check_rebuild()
 		}
 	}
 
+	if(!needs_rebuild())
+	{
+		// Some side effects might not exist
+		for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
+			if((*i)->needs_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
+	}
+
 	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(tool->get_executable())
 		{
-			if(package->get_cache().get_value(this, "build_sig")!=build_sig)
-				mark_rebuild("Build signature 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");
+			}
 		}
 	}
 }
@@ -106,15 +120,33 @@ string FileTarget::create_build_signature() const
 		return string();
 
 	const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
-	return tool->create_build_signature(binfo);
+	list<string> sigs;
+	if(nested_build_sig && component)
+	{
+		set<const Tool *> depend_tools;
+		for(Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+			if((*i)->get_component()==component && (*i)->get_tool())
+				depend_tools.insert((*i)->get_tool());
+
+		for(set<const Tool *>::const_iterator i=depend_tools.begin(); i!=depend_tools.end(); ++i)
+			sigs.push_back((*i)->create_build_signature(binfo));
+		sigs.sort();
+		sigs.push_front(tool->create_build_signature(binfo));
+	}
+	else
+		sigs.push_back(tool->create_build_signature(binfo));
+
+	if(arch_in_build_sig)
+		if(const Architecture *arch = tool->get_architecture())
+			sigs.push_front(arch->get_name());
+
+	return join(sigs.begin(), sigs.end(), ";");
 }
 
-Task *FileTarget::build()
+void FileTarget::build(Task &task)
 {
-	if(tool && !builder.get_dry_run() && mtime)
-		FS::unlink(path);
-
-	return Target::build();
+	task.add_file(path);
+	task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)
@@ -132,3 +164,14 @@ void FileTarget::build_finished(bool success)
 
 	Target::build_finished(success);
 }
+
+void FileTarget::clean()
+{
+	if(mtime)
+	{
+		FS::unlink(path);
+		mtime = Time::TimeStamp();
+		size = 0;
+		check_rebuild();
+	}
+}