Change arch and prefix to global options

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index a5a944ed18e7131e856b7af5fbc3d13238fd4c67..ea2f4e0204684cb94ea25799fcd57e50a8029040 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,5 +1,12 @@
-#include <iostream>
-#include <msp/algo.h>
+/* $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"
@@ -26,8 +33,8 @@ 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();
+
        list<const Component *> queue;
        list<Target *> dep_libs;
        queue.push_back(&comp);
@@ -35,17 +42,16 @@ void Executable::find_depends()
        {
                const Component *c=queue.front();
                queue.erase(queue.begin());
-               
+
+               const StringList &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)
                {
-                       Target *lib=builder.get_library(*i, c->get_build_info().libpath, libmode);
+                       Target *lib=builder.get_library(*i, libpath, libmode);
                        if(lib)
                        {
-                               if(contains(depends, lib))
-                                       continue;
-
-                               dep_libs.push_front(lib);
+                               dep_libs.push_back(lib);
 
                                if(dynamic_cast<Install *>(lib))
                                        lib=lib->get_depends().front();
@@ -53,13 +59,20 @@ 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)));
                }
        }
 
+       /* Add only the last occurrence of each library to the actual dependencies.
+       This ensures that static library ordering is correct. */
        for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-               add_depend(*i);
+       {
+               bool last=true;
+               for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
+                       last=(j==i || *j!=*i);
+               if(last)
+                       add_depend(*i);
+       }
 
        deps_ready=true;
 }
@@ -75,15 +88,25 @@ we need to pass the value to the Target c'tor.
 */
 string Executable::generate_target_name(const Component &c)
 {
-       string prefix,suffix;
+       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)
        {
                prefix="lib";
-               suffix=".so";
+               if(arch=="win32")
+                       suffix=".dll";
+               else
+                       suffix=".so";
        }
        else if(c.get_type()==Component::MODULE)
                suffix=".m";
+       else if(c.get_type()==Component::PROGRAM)
+       {
+               if(arch=="win32")
+                       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();
 }