Give targets the ability to gather their own build info

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 05a475d71bb4b02ff82c8333f06cc1c976f6d40e..6efe77a6475b5ce74fc18d9c2435910b3734f5a8 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -18,12 +18,15 @@ 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::find_dependencies()
@@ -33,15 +36,20 @@ void Binary::find_dependencies()
 
        list<const Component *> queue;
        list<Target *> dep_libs;
+       set<string> missing_libs;
        queue.push_back(component);
        while(!queue.empty())
        {
-               const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const BuildInfo &binfo = c->get_build_info();
+               BuildInfo binfo;
+               collect_build_info(binfo);
+
                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)
@@ -56,8 +64,8 @@ void Binary::find_dependencies()
                                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));
                }
        }
 
@@ -72,18 +80,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(), ";");
-}