Add profile templates

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index fb1edfb2f2193b34b9f46ff35d0b95817a66b8a4..db8bd11db0b3c832790d3cbdbef4d2f717ad80fd 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,11 +1,16 @@
+#include <iostream>
+#include <msp/algo.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)),
@@ -16,16 +21,46 @@ Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *>
                add_depend(*i);
 }
 
+/**
+Finds and adds any required libraries to the dependencies.
+*/
 void Executable::find_depends()
 {
-       const list<string> &libs=comp.get_build_info().libs;
-       for(list<string>::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+       LibMode libmode=package->get_library_mode();
+       
+       list<const Component *> queue;
+       list<Target *> dep_libs;
+       queue.push_back(&comp);
+       while(!queue.empty())
        {
-               Target *lib=builder.get_library(*i, comp.get_build_info().libpath);
-               if(lib)
-                       add_depend(lib);
+               const Component *c=queue.front();
+               queue.erase(queue.begin());
+               
+               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);
+                       if(lib)
+                       {
+                               if(contains(depends, lib))
+                                       continue;
+
+                               dep_libs.push_front(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
+                               cout<<"Couldn't find library "<<*i<<" for "<<name<<'\n';
+                               //XXX Throw an exception here or something
+               }
        }
 
+       for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
+               add_depend(*i);
+
        deps_ready=true;
 }
 
@@ -34,15 +69,30 @@ Action *Executable::build()
        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(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_source()/(prefix+c.get_name()+suffix)).str();
+       return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }