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

diff --git a/source/executable.cpp b/source/executable.cpp
index 8f8c9a2..0cdeec4 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,55 +1,23 @@
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
-#include "link.h"
-#include "objectfile.h"
-#include "package.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()
-{
-	const list<string> &libs=comp.get_build_info().libs;
-	for(list<string>::const_iterator i=libs.begin(); i!=libs.end(); ++i)
-	{
-		Target *lib=builder.get_library(*i, comp.get_build_info().libpath);
-		if(lib)
-			add_depend(lib);
-	}
+Executable::Executable(Builder &b, const FS::Path &p):
+	Binary(b, p)
+{ }
 
-	deps_ready=true;
-}
-
-Action *Executable::build()
+Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+	Binary(b, c, generate_filename(c), objs)
 {
-	return Target::build(new Link(builder, *this));;
+	install_location = "bin";
 }
 
-/**
-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 Executable::generate_filename(const Component &comp)
 {
-	string prefix,suffix;
-
-	if(c.get_type()==Component::LIBRARY)
-	{
-		prefix="lib";
-		suffix=".so";
-	}
-
-	return (c.get_package().get_source()/(prefix+c.get_name()+suffix)).str();
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.get_executable_patterns().front().apply(comp.get_name());
 }