Refactor transitive dependencies to work on all targets

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
deleted file mode 100644 (file)
index 753ddbc..0000000
--- a/source/binary.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include <msp/fs/utils.h>
-#include <msp/strings/format.h>
-#include <msp/strings/utils.h>
-#include "binary.h"
-#include "builder.h"
-#include "component.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
-#include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tool.h"
-
-using namespace std;
-using namespace Msp;
-
-Binary::Binary(Builder &b, const FS::Path &p):
-       FileTarget(b, p)
-{ }
-
-Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-       FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
-       objects(objs)
-{
-       component = &c;
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               add_dependency(**i);
-
-       nested_build_sig = true;
-       arch_in_build_sig = true;
-}
-
-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())
-                       binfo.update_from(obj_tool->get_build_info());
-
-       Target::collect_build_info(binfo);
-
-       binfo.update_from(static_binfo);
-}
-
-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)
-       {
-               Target *tgt = *j;
-
-               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());
-                       if(binfo.threads)
-                               static_binfo.threads = true;
-               }
-
-               list<Target *> libs_to_process;
-               for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-               {
-                       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)
-                               libs_to_process.push_back(lib);
-                       else if(missing_libs.insert(*i).second)
-                               problems.push_back(format("Required library %s not found", *i));
-               }
-
-               if(tgt!=this)
-               {
-                       const Target::Dependencies &tdeps = tgt->get_transitive_dependencies();
-                       libs_to_process.insert(libs_to_process.end(), tdeps.begin(), tdeps.end());
-               }
-
-               list<Target *>::iterator insert_pos = j;
-               ++insert_pos;
-               for(list<Target *>::const_iterator i=libs_to_process.begin(); i!=libs_to_process.end(); ++i)
-               {
-                       Target *real = (*i)->get_real_target();
-                       if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-                               queue.insert(insert_pos, stlib);
-                       else
-                               dep_libs.push_back(*i);
-               }
-       }
-
-       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);
-       }
-}