Remove dead code

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index a809e64b0745341d21c4734cb60513cf8f0b6d2a..2d0a409c5f2c53835fd38f6457e8fcccabb37ee6 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -3,7 +3,6 @@
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "link.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -13,11 +12,11 @@ using namespace std;
 using namespace Msp;
 
 Binary::Binary(Builder &b, const FS::Path &p):
-       FileTarget(b, 0, p)
+       FileTarget(b, p)
 { }
 
-Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), generate_target_path(c))
+Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
+       FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p)
 {
        component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
@@ -27,10 +26,7 @@ Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
 void Binary::find_depends()
 {
        if(!component)
-       {
-               deps_ready = true;
                return;
-       }
 
        const SourcePackage &spkg = component->get_package();
        LibMode libmode = spkg.get_library_mode();
@@ -45,10 +41,10 @@ void Binary::find_depends()
                const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const StringList &libpath = c->get_build_info().libpath;
+               const BuildInfo::PathList &libpath = c->get_build_info().libpath;
 
-               const list<string> &libs = c->get_build_info().libs;
-               for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+               const BuildInfo::WordList &libs = c->get_build_info().libs;
+               for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
                        Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
                        if(lib)
@@ -74,31 +70,4 @@ void Binary::find_depends()
                if(last)
                        add_depend(*i);
        }
-
-       deps_ready = true;
-}
-
-FS::Path Binary::generate_target_path(const Component &c)
-{
-       const SourcePackage &pkg = c.get_package();
-       string prefix, suffix;
-       const string &sys = pkg.get_builder().get_current_arch().get_system();
-
-       if(c.get_type()==Component::LIBRARY)
-       {
-               prefix = "lib";
-               if(sys=="windows")
-                       suffix = ".dll";
-               else
-                       suffix = ".so";
-       }
-       else if(c.get_type()==Component::MODULE)
-               suffix = ".m";
-       else if(c.get_type()==Component::PROGRAM)
-       {
-               if(sys=="windows")
-                       suffix = ".exe";
-       }
-
-       return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
 }