More flexible way to manage filename patterns

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index fb1edfb2f2193b34b9f46ff35d0b95817a66b8a4..9cd493d01c440935050cd51a6f70be65e9b8a5f0 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,48 +1,17 @@
 #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);
-}
-
-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);
-       }
-
-       deps_ready=true;
-}
+Executable::Executable(Builder &b, const FS::Path &p):
+       Binary(b, p)
+{ }
 
-Action *Executable::build()
-{
-       return Target::build(new Link(builder, *this));;
-}
-
-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;
-
-       if(c.get_type()==Component::LIBRARY)
-       {
-               prefix="lib";
-               suffix=".so";
-       }
-
-       return (c.get_package().get_source()/(prefix+c.get_name()+suffix)).str();
+       install_location = "bin";
 }