Revamp problem reporting system to be more useful

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 2dfeee8affbbbce98ee5a812da75433ca60d32b2..0cae259f8b7b755bf74da0913a516ecafbd7d09a 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,28 +1,112 @@
+/* $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"
+#include "install.h"
+#include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "staticlibrary.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);
 }
 
-string Executable::generate_target_name(const Component &comp)
+/**
+Finds and adds any required libraries to the dependencies.
+*/
+void Executable::find_depends()
+{
+       LibMode libmode=comp.get_package().get_library_mode();
+
+       list<const Component *> queue;
+       list<Target *> dep_libs;
+       queue.push_back(&comp);
+       while(!queue.empty())
+       {
+               const Component *c=queue.front();
+               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);
+                       if(lib)
+                       {
+                               dep_libs.push_back(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
+                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, Path::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)
+       {
+               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;
+}
+
+Action *Executable::build()
 {
-       string prefix;
-       string suffix;
+       return Target::build(new Link(builder, *this));;
+}
+
+/**
+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)
+{
+       string prefix, suffix;
+       const string &arch=c.get_package().get_arch();
 
-       if(comp.get_type()==Component::LIBRARY)
+       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 (comp.get_package().get_source()/(prefix+comp.get_name()+suffix)).str();
+       return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }