X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=1f23990da93ca569af5476a7032a468d597549d4;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=2dfeee8affbbbce98ee5a812da75433ca60d32b2;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index 2dfeee8..1f23990 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,28 +1,83 @@
+#include <iostream>
+#include <msp/algo.h>
+#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)),
 	comp(c)
 {
+	buildable=true;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_depend(*i);
 }
 
-string Executable::generate_target_name(const Component &comp)
+/**
+Finds and adds any required libraries to the dependencies.
+*/
+void Executable::find_depends()
 {
-	string prefix;
-	string suffix;
+	LibMode libmode=package->get_library_mode();
+	
+	//XXX Duplicate libraries?
+	list<const Component *> queue;
+	queue.push_back(&comp);
+	while(!queue.empty())
+	{
+		const Component *c=queue.front();
+		queue.erase(queue.begin());
+		
+		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, c->get_build_info().libpath, libmode);
+			if(lib)
+			{
+				if(contains(depends, lib))
+					continue;
+				add_depend(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
+		}
+	}
+
+	deps_ready=true;
+}
+
+Action *Executable::build()
+{
+	return Target::build(new Link(builder, *this));;
+}
+
+/**
+Returns the name for the executable.  We can't do this in the constructor since
+we need to pass the value to the Target c'tor.
+*/
+string Executable::generate_target_name(const Component &c)
+{
+	string prefix,suffix;
 
-	if(comp.get_type()==Component::LIBRARY)
+	if(c.get_type()==Component::LIBRARY)
 	{
 		prefix="lib";
 		suffix=".so";
 	}
 
-	return (comp.get_package().get_source()/(prefix+comp.get_name()+suffix)).str();
+	return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }