Collect libpath for static library dependencies from the libs themselves

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index d0cc1e9822922726f5a5cce8f2af3c5fa0a7b7af..4e7f547f36f7d05b9212a09f957907e1c79c75a8 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -4,6 +4,7 @@
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
+#include "booleanevaluator.h"
 #include "builder.h"
 #include "component.h"
 #include "csourcefile.h"
@@ -59,15 +60,14 @@ void Component::create_build_info()
        }
 
        final_build_info.update_from(package.get_build_info());
+       final_build_info.update_from(build_info);
+       build_info = final_build_info;
 
        for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
                *i = (package.get_source_directory() / *i).str();
        for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
                *i = (package.get_source_directory() / *i).str();
 
-       final_build_info.update_from(build_info);
-       build_info = final_build_info;
-
        for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
        {
                /* Select an include path that contains all the sources for this and the
@@ -90,15 +90,6 @@ void Component::create_build_info()
        if(type==LIBRARY || type==MODULE)
                if(build_info.libmode<BuildInfo::DYNAMIC)
                        build_info.libmode = BuildInfo::DYNAMIC;
-
-       if(build_info.libmode<BuildInfo::DYNAMIC)
-       {
-               for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-               {
-                       const BuildInfo &ebi = (*i)->get_exported_build_info();
-                       build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
-               }
-       }
 }
 
 BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
@@ -211,13 +202,28 @@ void Component::create_targets() const
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
        {
                list<Target *> objs;
+               const Toolchain &pkg_tools = package.get_toolchain();
                for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        string ext = FS::extpart(FS::basename(*i));
+                       Target *src = 0;
+
+                       Tool *gen = pkg_tools.get_tool_for_suffix(ext);
+                       if(gen)
+                       {
+                               Target *tmpl = gen->create_source(*this, *i);
+                               if(tmpl)
+                               {
+                                       src = gen->create_target(*tmpl);
+                                       ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
+                               }
+                       }
+
                        Tool *tool = toolchain.get_tool_for_suffix(ext, true);
                        if(tool)
                        {
-                               Target *src = tool->create_source(*this, *i);
+                               if(!src)
+                                       src = tool->create_source(*this, *i);
                                if(!src)
                                        continue;
 
@@ -227,8 +233,16 @@ void Component::create_targets() const
                                        objs.push_back(obj);
                                }
 
-                               if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-                                       build_graph.add_installed_target(*src);
+                               if(type==LIBRARY && install)
+                               {
+                                       if(dynamic_cast<FileTarget *>(src)->is_installable())
+                                               build_graph.add_installed_target(*src);
+
+                                       const Target::Dependencies &side_effects = src->get_side_effects();
+                                       for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j)
+                                               if(dynamic_cast<FileTarget *>(*j)->is_installable())
+                                                       build_graph.add_installed_target(**j);
+                               }
                        }
                }
 
@@ -317,7 +331,8 @@ void Component::Loader::build_info()
 
 void Component::Loader::if_arch(const string &cond)
 {
-       bool match = obj.package.get_builder().get_current_arch().match_name(cond);
+       BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false);
+       bool match = eval.evaluate(cond);
        obj.package.get_builder().get_logger().log("configure",
                format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
        if(match)
@@ -326,7 +341,8 @@ void Component::Loader::if_arch(const string &cond)
 
 void Component::Loader::if_feature(const string &cond)
 {
-       bool match = obj.package.match_feature(cond);
+       BooleanEvaluator eval(sigc::mem_fun(&obj.package, &SourcePackage::match_feature));
+       bool match = eval.evaluate(cond);
        obj.package.get_builder().get_logger().log("configure",
                format("%s/%s: feature %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
        if(match)
@@ -348,6 +364,8 @@ void Component::Loader::require(const string &n)
        Package *req = obj.package.get_builder().get_package_manager().find_package(n);
        if(req)
                obj.requires.push_back(req);
+       else
+               obj.problems.push_back(format("Required package %s not found", n));
 }
 
 void Component::Loader::source(const string &s)