]> git.tdb.fi Git - builder.git/blobdiff - source/component.cpp
Only use files from the first overlay that has them
[builder.git] / source / component.cpp
index 5e918c841719967b99f904c0d3c5fae05aaeb158..a42b81cded44229d877882c535b11c2982ecfb77 100644 (file)
@@ -4,27 +4,16 @@
 #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"
-#include "datapack.h"
-#include "executable.h"
-#include "file.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
-#include "tool.h"
-#include "toolchain.h"
 
 using namespace std;
 using namespace Msp;
 
-Component::Component(SourcePackage &p, Type t, const string &n):
+Component::Component(SourcePackage &p, const string &n):
        package(p),
-       type(t),
        name(n),
        install(false),
        deflt(true)
@@ -59,46 +48,13 @@ 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
-               used component.  This should produce a sensible result in most cases. */
-               FS::Path base;
-               for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
-                       base = base.empty() ? *j : FS::common_ancestor(base, *j);
-               const SourceList &use_sources = (*i)->get_sources();
-               for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
-                       base = FS::common_ancestor(base, *j);
-               build_info.incpath.push_back(base);
-               build_info.libs.push_back((*i)->get_name());
-               if(!(*i)->get_install())
-               {
-                       build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
-                       build_info.libpath.push_back((*i)->get_package().get_source_directory());
-               }
-       }
-
-       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
@@ -127,134 +83,6 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
        return binfo;
 }
 
-void Component::create_targets() const
-{
-       Builder &builder = package.get_builder();
-       BuildGraph &build_graph = builder.get_build_graph();
-       const Toolchain &toolchain = builder.get_toolchain();
-
-       SourceList source_filenames = collect_source_files();
-
-       string inst_loc;
-       if(type==TARBALL)
-       {
-               Tool &tar = toolchain.get_tool("TAR");
-
-               list<Target *> files;
-               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       FileTarget *file = builder.get_vfs().get_target(*i);
-                       if(!file)
-                               file = new File(builder, package, *i);
-                       files.push_back(file);
-               }
-
-               string tarname = name;
-               if(name=="@src")
-               {
-                       tarname = package.get_name()+"-"+package.get_version();
-                       files.insert(files.begin(), &package.get_build_file());
-
-                       const BuildGraph::TargetMap &targets = build_graph.get_targets();
-                       for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-                               if(i->second->get_package()==&package && !i->second->is_buildable())
-                                       if(find(files.begin(), files.end(), i->second)==files.end())
-                                               files.push_back(i->second);
-               }
-
-               Target *result = tar.create_target(files, tarname);
-
-               build_graph.get_target("tarballs")->add_dependency(*result);
-
-               return;
-       }
-       else if(type==INSTALL)
-       {
-               Target *inst = build_graph.get_target("install");
-               Tool &copy = toolchain.get_tool("CP");
-               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       FileTarget *ft;
-                       if(Target *tgt = builder.get_vfs().get_target(*i))
-                               ft = dynamic_cast<FileTarget *>(tgt);
-                       else
-                               ft = new File(builder, package, *i);
-                       inst->add_dependency(*copy.create_target(*ft, name));
-               }
-       }
-       else if(type==DATAPACK)
-       {
-               Tool &dcomp = toolchain.get_tool("DATA");
-
-               list<Target *> files;
-               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       string ext = FS::extpart(FS::basename(*i));
-                       if(ext==".mdt")
-                       {
-                               Target *src = dcomp.create_source(*this, *i);
-                               files.push_back(dcomp.create_target(*src, "collection"));
-                       }
-                       else if(Target *tgt = builder.get_vfs().get_target(*i))
-                               files.push_back(tgt);
-                       else
-                               files.push_back(new File(builder, package, *i));
-               }
-
-               Target *result = dcomp.create_target(files, "pack");
-
-               build_graph.add_primary_target(*result);
-               if(install)
-                       build_graph.add_installed_target(*result);
-       }
-
-       if(type==PROGRAM || type==LIBRARY || type==MODULE)
-       {
-               list<Target *> objs;
-               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       string ext = FS::extpart(FS::basename(*i));
-                       Tool *tool = toolchain.get_tool_for_suffix(ext, true);
-                       if(tool)
-                       {
-                               Target *src = tool->create_source(*this, *i);
-                               if(!src)
-                                       continue;
-
-                               if(tool->accepts_suffix(ext))
-                               {
-                                       Target *obj = tool->create_target(*src);
-                                       objs.push_back(obj);
-                               }
-
-                               if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-                                       build_graph.add_installed_target(*src);
-                       }
-               }
-
-               Tool &linker = toolchain.get_tool("LINK");
-
-               list<Target *> results;
-               if(type==LIBRARY)
-               {
-                       Tool &archiver = toolchain.get_tool("AR");
-                       results.push_back(linker.create_target(objs, "shared"));
-                       results.push_back(archiver.create_target(objs));
-               }
-               else if(type==MODULE)
-                       results.push_back(linker.create_target(objs, "shared"));
-               else
-                       results.push_back(linker.create_target(objs));
-
-               for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
-               {
-                       build_graph.add_primary_target(**i);
-                       if(install)
-                               build_graph.add_installed_target(**i);
-               }
-       }
-}
-
 Component::SourceList Component::collect_source_files() const
 {
        SourceList files;
@@ -271,12 +99,21 @@ Component::SourceList Component::collect_source_files() const
                                if(FS::is_dir(opath))
                                        dirs.push_back(opath);
                        }
+                       set<string> overlay_files;
                        for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
                        {
                                package.get_builder().get_logger().log("files", format("Traversing %s", *j));
                                list<string> sfiles = list_files(*j);
                                for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+                               {
+                                       if(j!=dirs.begin())
+                                       {
+                                               if(overlay_files.count(*k))
+                                                       continue;
+                                               overlay_files.insert(*k);
+                                       }
                                        files.push_back(*j / *k);
+                               }
                        }
                }
                else
@@ -307,7 +144,6 @@ Component::Loader::Loader(Component &c):
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("default",         &Component::deflt);
-       add("use",             &Loader::use);
 }
 
 void Component::Loader::build_info()
@@ -317,7 +153,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 +163,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)
@@ -356,15 +194,3 @@ void Component::Loader::source(const string &s)
 {
        obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }
-
-void Component::Loader::use(const string &n)
-{
-       const SourcePackage::ComponentList &components = obj.package.get_components();
-       for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
-               if(i->get_name()==n && i->get_type()==LIBRARY)
-               {
-                       obj.uses.push_back(&*i);
-                       return;
-               }
-       throw invalid_argument("Component::Loader::use");
-}