X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=7b5bac8e1b0dae70d977cc68326b94aba438bdcd;hb=9f885c3eec8f065b7dc400acfb9dd67158284fcf;hp=709dbd16a52cfbd068d9c3733ca2f7671a2ebac6;hpb=172db6b81ecc2aa418729a6815b9134a685545fc;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 709dbd1..7b5bac8 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,101 +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 Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c)),
-	comp(c)
+Binary::Binary(Builder &b, const FS::Path &p):
+	FileTarget(b, 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)
 {
-	buildable = true;
-	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-		add_depend(*i);
+	component = &c;
+	for(ObjectFile *o: objects)
+		add_dependency(*o);
 
-	if(c.get_type()==Component::LIBRARY)
-		install_location = "lib";
-	else if(c.get_type()==Component::MODULE)
-		install_location = "lib/"+package->get_name();
-	else if(c.get_type()==Component::PROGRAM)
-		install_location = "bin";
+	nested_build_sig = true;
+	arch_in_build_sig = true;
 }
 
-void Binary::find_depends()
+void Binary::collect_build_info(BuildInfo &binfo) const
 {
-	LibMode libmode = comp.get_package().get_library_mode();
-	if(dynamic_cast<SharedLibrary *>(this))
-		libmode = DYNAMIC;
-
-	list<const Component *> queue;
-	list<Target *> dep_libs;
-	queue.push_back(&comp);
-	while(!queue.empty())
-	{
-		const Component *c = queue.front();
-		queue.erase(queue.begin());
+	for(ObjectFile *o: objects)
+		if(const Tool *obj_tool = o->get_tool())
+			binfo.update_from(obj_tool->get_build_info());
 
-		const StringList &libpath = c->get_build_info().libpath;
+	Target::collect_build_info(binfo);
 
-		const list<string> &libs = c->get_build_info().libs;
-		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
-		{
-			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
-			if(lib)
-			{
-				dep_libs.push_back(lib);
+	binfo.update_from(static_binfo);
+}
 
-				lib = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
-					queue.push_back(&stlib->get_component());
-			}
-			else
-				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
-		}
-	}
+void Binary::find_dependencies()
+{
+	if(!component)
+		return;
 
-	/* 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);
-	}
+	vector<Target *> static_libs;
+	vector<Target *> shared_libs;
+	vector<string> missing_libs;
+	find_dependencies(this, static_libs, shared_libs, missing_libs);
 
-	deps_ready = true;
+	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));
 }
 
-FS::Path Binary::generate_target_path(const Component &c)
+void Binary::find_dependencies(Target *tgt, vector<Target *> &static_libs, vector<Target *> &shared_libs, vector<string> &missing_libs)
 {
-	const SourcePackage &pkg = c.get_package();
-	string prefix, suffix;
-	const string &sys = pkg.get_builder().get_current_arch().get_system();
-
-	if(c.get_type()==Component::LIBRARY)
+	BuildInfo binfo;
+	tgt->collect_build_info(binfo);
+	if(tgt!=this)
 	{
-		prefix = "lib";
-		if(sys=="windows")
-			suffix = ".dll";
-		else
-			suffix = ".so";
+		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;
 	}
-	else if(c.get_type()==Component::MODULE)
-		suffix = ".m";
-	else if(c.get_type()==Component::PROGRAM)
+
+	for(const string &l: binfo.libs)
 	{
-		if(sys=="windows")
-			suffix = ".exe";
-	}
+		if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
+			continue;
 
-	return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
+		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 *real = lib->get_real_target();
+			if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+			{
+				/* 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 if(!any_equals(shared_libs, lib))
+				shared_libs.push_back(lib);
+		}
+		else if(!any_equals(missing_libs, l))
+			missing_libs.push_back(l);
+	}
 }