#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 "link.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, 0, p)
+ FileTarget(b, p)
{ }
-Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<ObjectFile *> &objs):
- FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/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=objs.begin(); i!=objs.end(); ++i)
- add_depend(*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::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_depends()
+void Binary::find_dependencies()
{
if(!component)
- {
- deps_ready = true;
return;
- }
- const SourcePackage &spkg = component->get_package();
- LibMode libmode = spkg.get_library_mode();
- if(dynamic_cast<SharedLibrary *>(this))
- libmode = DYNAMIC;
-
- 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;
- const StringList &libpath = c->get_build_info().libpath;
+ 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;
+ }
- const list<string> &libs = c->get_build_info().libs;
- for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+ list<Target *>::iterator insert_pos = j;
+ ++insert_pos;
+ for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
{
- Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
+ 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))
- queue.push_back(stlib->get_component());
+ Target *real = lib->get_real_target();
+ if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+ queue.insert(insert_pos, stlib);
+ else
+ dep_libs.push_back(lib);
}
- else
- builder.problem(spkg.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)
for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
last = (j==i || *j!=*i);
if(last)
- add_depend(*i);
+ add_dependency(**i);
}
-
- deps_ready = true;
}