X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=51a92d13b1a11f61c34671a1d8c39adfa710bdcc;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=b42580a099a0a95eb411bc34fa65345cd72a2b03;hpb=486adc75285b8b5d62a990dd9f9cd4737c8ab7f6;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index b42580a..51a92d1 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -30,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);
 
@@ -70,7 +72,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-	if(!tool)
+	if(!tool || needs_rebuild())
 		return;
 
 	if(!mtime)
@@ -89,12 +91,10 @@ 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)
-		{
-			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
-			if(ft && !ft->get_mtime())
-				mark_rebuild((*i)->get_name()+" does not exist");
-		}
+			if((*i)->needs_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
 	}
 
 	if(!needs_rebuild() && package)
@@ -120,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)
 {
-	Task *task = Target::build();
-	task->set_file(path);
-	task->set_unlink(true);
-	return task;
+	task.add_file(path);
+	task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)