X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=0cdeec41edda0a3c815d373fb326663fe863d2ac;hb=8c9e5422b0ef5ee6d80cc23db8fe84f4a0812ddc;hp=156823340a533849346e9425a54d0d59eb35e0ca;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index 1568233..0cdeec4 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,35 +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);
-}
+Executable::Executable(Builder &b, const FS::Path &p):
+	Binary(b, p)
+{ }
 
-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, comp));;
+	install_location = "bin";
 }
 
-string Executable::generate_target_name(const Component &comp)
+string Executable::generate_filename(const Component &comp)
 {
-	string prefix;
-	string suffix;
-
-	if(comp.get_type()==Component::LIBRARY)
-	{
-		prefix="lib";
-		suffix=".so";
-	}
-
-	return (comp.get_package().get_source()/(prefix+comp.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());
 }