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 6fd6161989f24450ca4352b60126f474d545f366..6efe77a6475b5ce74fc18d9c2435910b3734f5a8 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
@@ -7,6 +8,7 @@
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -16,11 +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=objs.begin(); i!=objs.end(); ++i)
+       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()
@@ -28,31 +34,38 @@ void Binary::find_dependencies()
        if(!component)
                return;
 
-       BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
-
        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)
                        {
-                               dep_libs.push_back(lib);
-
-                               lib = lib->get_real_target();
-                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(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());
+                               }
+                               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));
                }
        }