Rewrite dependency finding algorithms in a few classes

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 448292cf051a5899412ba89329888053312276cc..7b5bac8e1b0dae70d977cc68326b94aba438bdcd 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -22,8 +23,8 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
        objects(objs)
 {
        component = &c;
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               add_dependency(**i);
+       for(ObjectFile *o: objects)
+               add_dependency(*o);
 
        nested_build_sig = true;
        arch_in_build_sig = true;
@@ -31,8 +32,8 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
 
 void Binary::collect_build_info(BuildInfo &binfo) const
 {
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               if(const Tool *obj_tool = (*i)->get_tool())
+       for(ObjectFile *o: objects)
+               if(const Tool *obj_tool = o->get_tool())
                        binfo.update_from(obj_tool->get_build_info());
 
        Target::collect_build_info(binfo);
@@ -45,55 +46,55 @@ void Binary::find_dependencies()
        if(!component)
                return;
 
-       list<Target *> queue;
-       list<Target *> dep_libs;
-       set<string> missing_libs;
-       queue.push_back(this);
-       for(list<Target *>::iterator j=queue.begin(); j!=queue.end(); ++j)
+       vector<Target *> static_libs;
+       vector<Target *> shared_libs;
+       vector<string> missing_libs;
+       find_dependencies(this, static_libs, shared_libs, missing_libs);
+
+       for(Target *t: static_libs)
+               add_dependency(*t);
+       for(Target *t: shared_libs)
+               add_dependency(*t);
+       for(const string &m: missing_libs)
+               problems.push_back(format("Required library %s not found", m));
+}
+
+void Binary::find_dependencies(Target *tgt, vector<Target *> &static_libs, vector<Target *> &shared_libs, vector<string> &missing_libs)
+{
+       BuildInfo binfo;
+       tgt->collect_build_info(binfo);
+       if(tgt!=this)
        {
-               Target *tgt = *j;
+               static_binfo.libpath.insert(static_binfo.libpath.end(), binfo.libpath.begin(), binfo.libpath.end());
+               static_binfo.keep_symbols.insert(static_binfo.keep_symbols.end(), binfo.keep_symbols.begin(), binfo.keep_symbols.end());
+               if(binfo.threads)
+                       static_binfo.threads = true;
+       }
 
-               BuildInfo binfo;
-               tgt->collect_build_info(binfo);
-               if(tgt!=this)
-               {
-                       static_binfo.libpath.insert(static_binfo.libpath.end(), binfo.libpath.begin(), binfo.libpath.end());
-                       static_binfo.keep_symbols.insert(static_binfo.keep_symbols.end(), binfo.keep_symbols.begin(), binfo.keep_symbols.end());
-               }
+       for(const string &l: binfo.libs)
+       {
+               if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
+                       continue;
 
-               list<Target *>::iterator insert_pos = j;
-               ++insert_pos;
-               for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+               BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(l);
+               Target *lib = builder.get_vfs().find_library(l, binfo.libpath, libmode);
+               if(lib)
                {
-                       if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
-                               continue;
-
-                       BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
-                       Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
-                       if(lib)
+                       Target *real = lib->get_real_target();
+                       if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
                        {
-                               Target *real = lib->get_real_target();
-                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-                                       queue.insert(insert_pos, stlib);
-                               else
-                                       dep_libs.push_back(lib);
+                               /* Keep only the last occurrence of each static library.  This
+                               ensures the order is correct for linking. */
+                               auto i = find(static_libs, stlib);
+                               if(i!=static_libs.end())
+                                       static_libs.erase(i);
+                               static_libs.push_back(stlib);
+                               find_dependencies(stlib, static_libs, shared_libs, missing_libs);
                        }
-                       else if(missing_libs.insert(*i).second)
-                               problems.push_back(format("Required library %s not found", *i));
+                       else if(!any_equals(shared_libs, lib))
+                               shared_libs.push_back(lib);
                }
-       }
-
-       queue.pop_front();
-       dep_libs.splice(dep_libs.begin(), queue);
-
-       /* Add only the last occurrence of each library to the actual dependencies.
-       This ensures that static library ordering is correct. */
-       for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-       {
-               bool last = true;
-               for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
-                       last = (j==i || *j!=*i);
-               if(last)
-                       add_dependency(**i);
+               else if(!any_equals(missing_libs, l))
+                       missing_libs.push_back(l);
        }
 }