X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=1434372ed3b5bf6c14d6a758e4b9f28433ea7d59;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=51a92d13b1a11f61c34671a1d8c39adfa710bdcc;hpb=8575b50479945c3ad6ab0e4ea7eb116da5b5f04d;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 51a92d1..1434372 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -79,22 +80,24 @@ void FileTarget::check_rebuild()
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
+		for(Target *d: depends)
 		{
-			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+			FileTarget *ft = dynamic_cast<FileTarget *>(d);
 			if(ft && ft->get_mtime()>mtime)
-				mark_rebuild((*i)->get_name()+" has changed");
-			else if((*i)->needs_rebuild())
-				mark_rebuild((*i)->get_name()+" needs rebuilding");
+				mark_rebuild(d->get_name()+" has changed");
+			else if(d->needs_rebuild())
+				mark_rebuild(d->get_name()+" needs rebuilding");
+			if(needs_rebuild())
+				break;
 		}
 	}
 
 	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");
+		auto i = find_if(side_effects, [](const Target *s){ return s->needs_rebuild(); });
+		if(i!=side_effects.end())
+			mark_rebuild((*i)->get_name()+" needs rebuilding");
 	}
 
 	if(!needs_rebuild() && package)
@@ -120,25 +123,29 @@ string FileTarget::create_build_signature() const
 		return string();
 
 	const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
-	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));
+	vector<string> sigs;
 
 	if(arch_in_build_sig)
 		if(const Architecture *arch = tool->get_architecture())
-			sigs.push_front(arch->get_name());
+			sigs.push_back(arch->get_name());
+
+	sigs.push_back(tool->create_build_signature(binfo));
+
+	if(nested_build_sig && component)
+	{
+		vector<const Tool *> seen_tools;
+		vector<string> tool_sigs;
+		for(Target *d: depends)
+			if(const Tool *t = d->get_tool())
+				if(d->get_component()==component && !any_equals(seen_tools, t))
+				{
+					seen_tools.push_back(t);
+					tool_sigs.push_back(t->create_build_signature(binfo));
+				}
+
+		sort(tool_sigs);
+		sigs.insert(sigs.end(), make_move_iterator(tool_sigs.begin()), make_move_iterator(tool_sigs.end()));
+	}
 
 	return join(sigs.begin(), sigs.end(), ";");
 }