X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=e632937775abc1b73f3c2a798b21c2eda8a20443;hb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;hp=8f8c9a2dc0f2c3d35ff93b0206acc45b6befd26b;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index 8f8c9a2..e632937 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,11 +1,15 @@
+#include <iostream>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
+#include "install.h"
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "staticlibrary.h"
 
 using namespace std;
+using namespace Msp;
 
 Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
 	Target(b, &c.get_package(), generate_target_name(c)),
@@ -21,12 +25,47 @@ Finds and adds any required libraries to the dependencies.
 */
 void Executable::find_depends()
 {
-	const list<string> &libs=comp.get_build_info().libs;
-	for(list<string>::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+	LibMode libmode=package->get_library_mode();
+
+	list<const Component *> queue;
+	list<Target *> dep_libs;
+	queue.push_back(&comp);
+	while(!queue.empty())
 	{
-		Target *lib=builder.get_library(*i, comp.get_build_info().libpath);
-		if(lib)
-			add_depend(lib);
+		const Component *c=queue.front();
+		queue.erase(queue.begin());
+
+		const StringList &libpath=c->get_build_info().libpath;
+		const string &arch=c->get_package().get_arch();
+
+		const list<string> &libs=c->get_build_info().libs;
+		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+		{
+			Target *lib=builder.get_library(*i, arch, libpath, libmode);
+			if(lib)
+			{
+				dep_libs.push_back(lib);
+
+				if(dynamic_cast<Install *>(lib))
+					lib=lib->get_depends().front();
+				if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(lib))
+					queue.push_back(&stlib->get_component());
+			}
+			else
+				cout<<"Couldn't find library "<<*i<<" for "<<name<<'\n';
+				//XXX Throw an exception here or something
+		}
+	}
+
+	/* 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;
@@ -44,12 +83,23 @@ we need to pass the value to the Target c'tor.
 string Executable::generate_target_name(const Component &c)
 {
 	string prefix,suffix;
+	const string &arch=c.get_package().get_arch();
 
 	if(c.get_type()==Component::LIBRARY)
 	{
 		prefix="lib";
-		suffix=".so";
+		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";
 	}
 
-	return (c.get_package().get_source()/(prefix+c.get_name()+suffix)).str();
+	return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }