X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=9cd493d01c440935050cd51a6f70be65e9b8a5f0;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hp=d1cc59aa174c278dac0c533e12254cbbbf71c5b7;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index d1cc59a..9cd493d 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,112 +1,17 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#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"
+#include "sourcepackage.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);
-}
-
-/**
-Finds and adds any required libraries to the dependencies.
-*/
-void Executable::find_depends()
-{
-	LibMode libmode=comp.get_package().get_library_mode();
-
-	list<const Component *> queue;
-	list<Target *> dep_libs;
-	queue.push_back(&comp);
-	while(!queue.empty())
-	{
-		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);
+Executable::Executable(Builder &b, const FS::Path &p):
+	Binary(b, p)
+{ }
 
-				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;
-}
-
-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)
+Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+	Binary(b, c, b.get_current_arch().create_filename<Executable>(c.get_name()), objs)
 {
-	string prefix,suffix;
-	const string &arch=c.get_package().get_arch();
-
-	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";
-	}
-
-	return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
+	install_location = "bin";
 }