Move the Component reference to Target and make it a pointer

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 08da59af1c82a4de868cfdb20381a60857d06321..ff98644ec53a6711ed3e63910a0876bd6447dc40 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,43 +1,38 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "link.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sharedlibrary.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
 Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), generate_target_path(c)),
-       comp(c)
+       FileTarget(b, &c.get_package(), generate_target_path(c))
 {
-       buildable = true;
+       component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                add_depend(*i);
 }
 
 void Binary::find_depends()
 {
-       LibMode libmode = comp.get_package().get_library_mode();
+       if(!component)
+               return;
+
+       const SourcePackage &spkg = component->get_package();
+       LibMode libmode = spkg.get_library_mode();
        if(dynamic_cast<SharedLibrary *>(this))
                libmode = DYNAMIC;
 
        list<const Component *> queue;
        list<Target *> dep_libs;
-       queue.push_back(&comp);
+       queue.push_back(component);
        while(!queue.empty())
        {
                const Component *c = queue.front();
@@ -48,18 +43,17 @@ void Binary::find_depends()
                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, libpath, libmode);
+                       Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
                        if(lib)
                        {
                                dep_libs.push_back(lib);
 
-                               if(Install *inst = dynamic_cast<Install *>(lib))
-                                       lib = &inst->get_source();
+                               lib = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
-                                       queue.push_back(&stlib->get_component());
+                                       queue.push_back(stlib->get_component());
                        }
                        else
-                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
+                               builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
                }
        }
 
@@ -77,21 +71,16 @@ void Binary::find_depends()
        deps_ready = true;
 }
 
-Action *Binary::create_action()
-{
-       return new Link(builder, *this);
-}
-
 FS::Path Binary::generate_target_path(const Component &c)
 {
        const SourcePackage &pkg = c.get_package();
        string prefix, suffix;
-       const string &arch = pkg.get_builder().get_current_arch().get_name();
+       const string &sys = pkg.get_builder().get_current_arch().get_system();
 
        if(c.get_type()==Component::LIBRARY)
        {
                prefix = "lib";
-               if(arch=="win32")
+               if(sys=="windows")
                        suffix = ".dll";
                else
                        suffix = ".so";
@@ -100,7 +89,7 @@ FS::Path Binary::generate_target_path(const Component &c)
                suffix = ".m";
        else if(c.get_type()==Component::PROGRAM)
        {
-               if(arch=="win32")
+               if(sys=="windows")
                        suffix = ".exe";
        }