X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=753ddbc391a427aae7c35487ac3395a76d08b512;hb=720daf583decd04b228caeed02d89f60513b93ef;hp=591e9347f59298cda7e454f56320d09fb173a4b3;hpb=66d1078c04849ec17a7343d0494d6ed087e04318;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 591e934..753ddbc 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,108 +1,111 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "install.h"
-#include "link.h"
 #include "objectfile.h"
-#include "package.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)
+{
+	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::collect_build_info(BuildInfo &binfo) const
 {
-	buildable=true;
-	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)
+		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()
 {
-	LibMode libmode=comp.get_package().get_library_mode();
-	if(dynamic_cast<SharedLibrary *>(this))
-		libmode=DYNAMIC;
+	if(!component)
+		return;
 
-	list<const Component *> queue;
+	list<Target *> queue;
 	list<Target *> dep_libs;
-	queue.push_back(&comp);
-	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 *> libs_to_process;
+		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
-			Target *lib=builder.get_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);
-
-				if(Install *inst=dynamic_cast<Install *>(lib))
-					lib=&inst->get_source();
-				if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(lib))
-					queue.push_back(&stlib->get_component());
-			}
+				libs_to_process.push_back(lib);
+			else if(missing_libs.insert(*i).second)
+				problems.push_back(format("Required library %s not found", *i));
+		}
+
+		if(tgt!=this)
+		{
+			const Target::Dependencies &tdeps = tgt->get_transitive_dependencies();
+			libs_to_process.insert(libs_to_process.end(), tdeps.begin(), tdeps.end());
+		}
+
+		list<Target *>::iterator insert_pos = j;
+		++insert_pos;
+		for(list<Target *>::const_iterator i=libs_to_process.begin(); i!=libs_to_process.end(); ++i)
+		{
+			Target *real = (*i)->get_real_target();
+			if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+				queue.insert(insert_pos, stlib);
 			else
-				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
+				dep_libs.push_back(*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)
 	{
-		bool last=true;
+		bool last = true;
 		for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
-			last=(j==i || *j!=*i);
+			last = (j==i || *j!=*i);
 		if(last)
-			add_depend(*i);
-	}
-
-	deps_ready=true;
-}
-
-Action *Binary::create_action()
-{
-	return new Link(builder, *this);
-}
-
-FS::Path Binary::generate_target_path(const Component &c)
-{
-	const SourcePackage &pkg=c.get_package();
-	string prefix, suffix;
-	const string &arch=pkg.get_builder().get_current_arch().get_name();
-
-	if(c.get_type()==Component::LIBRARY)
-	{
-		prefix="lib";
-		if(arch=="win32")
-			suffix=".dll";
-		else
-			suffix=".so";
-	}
-	else if(c.get_type()==Component::MODULE)
-		suffix=".m";
-	else if(c.get_type()==Component::PROGRAM)
-	{
-		if(arch=="win32")
-			suffix=".exe";
+			add_dependency(**i);
 	}
-
-	return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
 }