X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=a2bd3f0a1e0b1f922e2fe89feff2bd59483ca39e;hb=f0c0d720edc01f5faa72bb4ff4bf655445842678;hp=493f0203ee4f155a6e31a5e821a1a1a72c510c35;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 493f020..a2bd3f0 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -13,26 +13,11 @@
 using namespace std;
 using namespace Msp;
 
-FileTarget::FileTarget(Builder &b, const FS::Path &a):
-	Target(b, generate_name(b, 0, a)),
+FileTarget::FileTarget(Builder &b, const SourcePackage *p, const FS::Path &a):
+	Target(b, generate_name(b, p, a)),
 	path(a)
 {
-	init(0);
-}
-
-FileTarget::FileTarget(Builder &b, const SourcePackage &p, const FS::Path &a):
-	Target(b, generate_name(b, &p, a)),
-	path(a)
-{
-	init(&p);
-}
-
-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);
 
@@ -123,25 +108,29 @@ string FileTarget::create_build_signature() const
 		return string();
 
 	const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
-	list<string> sigs;
+	vector<string> sigs;
+
+	if(arch_in_build_sig)
+		if(const Architecture *arch = tool->get_architecture())
+			sigs.push_back(arch->get_name());
+
+	sigs.push_back(tool->create_build_signature(binfo));
+
 	if(nested_build_sig && component)
 	{
-		set<const Tool *> depend_tools;
+		vector<const Tool *> seen_tools;
+		vector<string> tool_sigs;
 		for(Target *d: depends)
-			if(d->get_component()==component && d->get_tool())
-				depend_tools.insert(d->get_tool());
-
-		for(const Tool *t: depend_tools)
-			sigs.push_back(t->create_build_signature(binfo));
-		sigs.sort();
-		sigs.push_front(tool->create_build_signature(binfo));
+			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()));
 	}
-	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(), ";");
 }