Add a list of symbols to keep in the binary to BuildInfo

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 05a475d71bb4b02ff82c8333f06cc1c976f6d40e..448292cf051a5899412ba89329888053312276cc 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -18,12 +18,26 @@ Binary::Binary(Builder &b, const FS::Path &p):
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-       FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p),
+       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()
@@ -31,36 +45,47 @@ void Binary::find_dependencies()
        if(!component)
                return;
 
-       list<const Component *> queue;
+       list<Target *> queue;
        list<Target *> dep_libs;
-       queue.push_back(component);
-       while(!queue.empty())
+       set<string> missing_libs;
+       queue.push_back(this);
+       for(list<Target *>::iterator j=queue.begin(); j!=queue.end(); ++j)
        {
-               const Component *c = queue.front();
-               queue.erase(queue.begin());
+               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());
+               }
 
-               const BuildInfo &binfo = c->get_build_info();
+               list<Target *>::iterator insert_pos = j;
+               ++insert_pos;
                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)
                        {
                                Target *real = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-                               {
-                                       dep_libs.push_back(stlib);
-                                       if(stlib->get_component())
-                                               queue.push_back(stlib->get_component());
-                               }
+                                       queue.insert(insert_pos, stlib);
                                else
                                        dep_libs.push_back(lib);
                        }
-                       else
-                               builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
+                       else if(missing_libs.insert(*i).second)
+                               problems.push_back(format("Required library %s not found", *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)
@@ -72,18 +97,3 @@ void Binary::find_dependencies()
                        add_dependency(**i);
        }
 }
-
-string Binary::create_build_signature() const
-{
-       set<const Tool *> object_tools;
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               object_tools.insert((*i)->get_tool());
-
-       list<string> sigs;
-       sigs.push_back(tool->create_build_signature(component->get_build_info()));
-       for(set<const Tool *>::const_iterator i=object_tools.begin(); i!=object_tools.end(); ++i)
-               sigs.push_back((*i)->create_build_signature(component->get_build_info()));
-       sigs.sort();
-
-       return join(sigs.begin(), sigs.end(), ";");
-}