More flexible way to manage filename patterns

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index cd8ceaff2040dc006cf446bc0b7ef80f9a0cd10a..9cd493d01c440935050cd51a6f70be65e9b8a5f0 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,88 +1,17 @@
-#include <iostream>
-#include <msp/algo.h>
 #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()
-{
-       const string &staticlibs=package->get_config().get_option("staticlibs").value;
-       unsigned libmode=0;
-       if(staticlibs=="all")
-               libmode=2;
-       else if(staticlibs=="local")
-               libmode=1;
-       
-       //XXX Duplicate libraries?
-       list<const Component *> queue;
-       queue.push_back(&comp);
-       while(!queue.empty())
-       {
-               const Component *c=queue.front();
-               queue.erase(queue.begin());
-               
-               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, c->get_build_info().libpath, libmode);
-                       if(lib)
-                       {
-                               if(contains(depends, lib))
-                                       continue;
-                               add_depend(lib);
-
-                               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
-               }
-       }
-
-       deps_ready=true;
-}
-
-Action *Executable::build()
-{
-       return Target::build(new Link(builder, *this));;
-}
+Executable::Executable(Builder &b, const FS::Path &p):
+       Binary(b, p)
+{ }
 
-/**
-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;
-
-       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";
 }