Convert all list containers to vectors

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 493f0203ee4f155a6e31a5e821a1a1a72c510c35..1434372ed3b5bf6c14d6a758e4b9f28433ea7d59 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -123,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;
+       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(), ";");
 }