Include libmode in library lookup hash

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index e632937775abc1b73f3c2a798b21c2eda8a20443..5d1e1c8f24fbf428a8dff009c886a3efde3f7c58 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,4 +1,12 @@
-#include <iostream>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/path/utils.h>
+#include <msp/strings/formatter.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -6,6 +14,7 @@
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sharedlibrary.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -25,7 +34,9 @@ Finds and adds any required libraries to the dependencies.
 */
 void Executable::find_depends()
 {
-       LibMode libmode=package->get_library_mode();
+       LibMode libmode=comp.get_package().get_library_mode();
+       if(dynamic_cast<SharedLibrary *>(this))
+               libmode=DYNAMIC;
 
        list<const Component *> queue;
        list<Target *> dep_libs;
@@ -36,12 +47,11 @@ void Executable::find_depends()
                queue.erase(queue.begin());
 
                const StringList &libpath=c->get_build_info().libpath;
-               const string &arch=c->get_package().get_arch();
 
                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, arch, libpath, libmode);
+                       Target *lib=builder.get_library(*i, libpath, libmode);
                        if(lib)
                        {
                                dep_libs.push_back(lib);
@@ -52,8 +62,7 @@ void Executable::find_depends()
                                        queue.push_back(&stlib->get_component());
                        }
                        else
-                               cout<<"Couldn't find library "<<*i<<" for "<<name<<'\n';
-                               //XXX Throw an exception here or something
+                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, basename(name)));
                }
        }
 
@@ -71,9 +80,9 @@ void Executable::find_depends()
        deps_ready=true;
 }
 
-Action *Executable::build()
+Action *Executable::create_action()
 {
-       return Target::build(new Link(builder, *this));;
+       return new Link(builder, *this);
 }
 
 /**
@@ -82,8 +91,9 @@ we need to pass the value to the Target c'tor.
 */
 string Executable::generate_target_name(const Component &c)
 {
-       string prefix,suffix;
-       const string &arch=c.get_package().get_arch();
+       const SourcePackage &pkg=c.get_package();
+       string prefix, suffix;
+       const string &arch=pkg.get_builder().get_current_arch().get_name();
 
        if(c.get_type()==Component::LIBRARY)
        {
@@ -101,5 +111,5 @@ string Executable::generate_target_name(const Component &c)
                        suffix=".exe";
        }
 
-       return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
+       return (pkg.get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }