More flexible way to manage filename patterns

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 2460f024d0f3f04647a3ba80279409c1639d1b48..9cd493d01c440935050cd51a6f70be65e9b8a5f0 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -6,14 +6,12 @@
 using namespace std;
 using namespace Msp;
 
-Executable::Executable(Builder &b, const Component &c, const std::list<ObjectFile *> &objs):
-       Binary(b, c, generate_filename(c), objs)
-{
-       install_location = "bin";
-}
+Executable::Executable(Builder &b, const FS::Path &p):
+       Binary(b, p)
+{ }
 
-string Executable::generate_filename(const Component &comp)
+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)
 {
-       const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-       return arch.get_executable_patterns().front().apply(comp.get_name());
+       install_location = "bin";
 }