X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=ffffaa56feed8a1ad15f9472c86f47d3f748f834;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=17ec7353998f7fc7078c70d56bbb99762dfb7fa2;hpb=2606b03da59dc10e3826b833a2fceb0831d79972;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 17ec735..ffffaa5 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,79 +1,100 @@
+#include <msp/core/algorithm.h>
 #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 vector<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(ObjectFile *o: objects)
+		add_dependency(*o);
+
+	nested_build_sig = true;
+	arch_in_build_sig = true;
 }
 
-void Binary::find_depends()
+void Binary::collect_build_info(BuildInfo &binfo) const
+{
+	for(ObjectFile *o: objects)
+		if(const Tool *obj_tool = o->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)
-	{
-		deps_ready = true;
 		return;
-	}
 
-	const SourcePackage &spkg = component->get_package();
-	LibMode libmode = spkg.get_library_mode();
-	if(dynamic_cast<SharedLibrary *>(this))
-		libmode = DYNAMIC;
+	vector<Target *> static_libs;
+	vector<Target *> shared_libs;
+	vector<string> missing_libs;
+	find_dependencies(this, static_libs, shared_libs, missing_libs);
+
+	for(Target *t: static_libs)
+		add_dependency(*t);
+	for(Target *t: shared_libs)
+		add_dependency(*t);
+	for(const string &m: missing_libs)
+		problems.push_back(format("Required library %s not found", m));
+}
 
-	list<const Component *> queue;
-	list<Target *> dep_libs;
-	queue.push_back(component);
-	while(!queue.empty())
+void Binary::find_dependencies(Target *tgt, vector<Target *> &static_libs, vector<Target *> &shared_libs, vector<string> &missing_libs)
+{
+	BuildInfo binfo;
+	tgt->collect_build_info(binfo);
+	if(tgt!=this)
 	{
-		const Component *c = queue.front();
-		queue.erase(queue.begin());
+		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 StringList &libpath = c->get_build_info().libpath;
+	for(const string &l: binfo.libs)
+	{
+		if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
+			continue;
 
-		const list<string> &libs = c->get_build_info().libs;
-		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+		BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(l);
+		Target *lib = builder.get_vfs().find_library(l, binfo.libpath, libmode);
+		if(lib)
 		{
-			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
-			if(lib)
+			Target *real = lib->get_real_target();
+			if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
 			{
-				dep_libs.push_back(lib);
-
-				lib = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
-					queue.push_back(stlib->get_component());
+				/* Keep only the last occurrence of each static library.  This
+				ensures the order is correct for linking. */
+				auto i = find(static_libs, stlib);
+				if(i!=static_libs.end())
+					static_libs.erase(i);
+				static_libs.push_back(stlib);
+				find_dependencies(stlib, static_libs, shared_libs, missing_libs);
 			}
-			else
-				builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
+			else if(!any_equals(shared_libs, lib))
+				shared_libs.push_back(lib);
 		}
+		else if(!any_equals(missing_libs, l))
+			missing_libs.push_back(l);
 	}
-
-	/* 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_depend(*i);
-	}
-
-	deps_ready = true;
 }