]> 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 4a889cb1750903209638a2cb2b8d8b3945847793..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 "datafile.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,152 +48,39 @@ 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;
-
-       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());
-               }
-       }
 }
 
-void Component::create_targets() const
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
 {
-       Builder &builder = package.get_builder();
-       const Toolchain &toolchain = builder.get_toolchain();
-
-       SourceList source_filenames = collect_source_files();
-       list<Target *> inst_list;
-
-       string inst_loc;
-       if(type==TARBALL)
-       {
-               const 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 Builder::TargetMap &targets = builder.get_targets();
-                       for(Builder::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);
-
-               builder.get_target("tarballs")->add_dependency(*result);
-
-               return;
-       }
-       else if(type==INSTALL)
-       {
-               inst_loc = name;
-               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_list.push_back(ft);
-               }
-       }
-       else if(type==DATAFILE)
-       {
-               const Tool &dcomp = toolchain.get_tool("DATA");
-
-               File *source;
-               if(Target *tgt = builder.get_vfs().get_target(source_filenames.front()))
-                       source = dynamic_cast<File *>(tgt);
-               else
-                       source = new File(builder, package, source_filenames.front());
-               Target *result = dcomp.create_target(*source);
-
-               builder.add_primary_target(*result);
-               if(install)
-                       inst_list.push_back(result);
-       }
-
-       if(type==PROGRAM || type==LIBRARY || type==MODULE)
+       // XXX Cache these and check that the directories actually exist before adding them
+       BuildInfo binfo = build_info;
+       if(!overlays.empty())
        {
-               list<Target *> objs;
-               for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
-               {
-                       string ext = FS::extpart(FS::basename(*i));
-                       const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
-                       if(tool)
+               FS::Path dir = FS::dirname(path);
+               string last = FS::basename(dir);
+               for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i)
+                       if(last==*i)
                        {
-                               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())
-                                       inst_list.push_back(src);
+                               dir = FS::dirname(dir);
+                               break;
                        }
-               }
-
-               const Tool &linker = toolchain.get_tool("LINK");
-
-               list<Target *> results;
-               if(type==LIBRARY)
-               {
-                       const 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)
-               {
-                       builder.add_primary_target(**i);
-                       if(install)
-                               inst_list.push_back(*i);
-               }
-       }
 
-       Target *inst_tgt = builder.get_target("install");
-       const Tool &copy = toolchain.get_tool("CP");
-       for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-       {
-               Target *inst = copy.create_target(**i, inst_loc);
-               inst_tgt->add_dependency(*inst);
+               for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+                       if(dir==*i)
+                       {
+                               binfo.local_incpath.push_back(dir);
+                               for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                                       binfo.local_incpath.push_back(*i/ *j);
+                       }
        }
+       return binfo;
 }
 
 Component::SourceList Component::collect_source_files() const
@@ -215,13 +91,41 @@ Component::SourceList Component::collect_source_files() const
                FS::Path path(*i);
                if(FS::is_dir(path))
                {
-                       package.get_builder().get_logger().log("files", format("Traversing %s", path));
-                       list<string> sfiles = list_files(path);
-                       for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-                               files.push_back(path / *j);
+                       SourceList dirs;
+                       dirs.push_back(path);
+                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       {
+                               FS::Path opath = path / *j;
+                               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
+               {
                        files.push_back(path);
+                       for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+                       {
+                               FS::Path opath = FS::dirname(path)/ *j/FS::basename(path);
+                               if(FS::is_reg(opath))
+                                       files.push_back(opath);
+                       }
+               }
        }
 
        return files;
@@ -231,6 +135,9 @@ Component::SourceList Component::collect_source_files() const
 Component::Loader::Loader(Component &c):
        DataFile::ObjectLoader<Component>(c)
 {
+       add("if_arch",         &Loader::if_arch);
+       add("if_feature",      &Loader::if_feature);
+       add("overlay",         &Loader::overlay);
        add("source",          &Loader::source);
        add("install",         &Component::install);
        add("install_map",     &Loader::install_map);
@@ -239,24 +146,51 @@ Component::Loader::Loader(Component &c):
        add("default",         &Component::deflt);
 }
 
-void Component::Loader::source(const string &s)
+void Component::Loader::build_info()
 {
-       obj.sources.push_back((obj.package.get_source_directory()/s).str());
+       load_sub(obj.build_info);
 }
 
-void Component::Loader::require(const string &n)
+void Component::Loader::if_arch(const string &cond)
 {
-       Package *req = obj.package.get_builder().get_package_manager().find_package(n);
-       if(req)
-               obj.requires.push_back(req);
+       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)
+               load_sub_with(*this);
 }
 
-void Component::Loader::build_info()
+void Component::Loader::if_feature(const string &cond)
 {
-       load_sub(obj.build_info);
+       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)
+               load_sub_with(*this);
 }
 
 void Component::Loader::install_map()
 {
        load_sub(obj.install_map, obj.package.get_source_directory());
 }
+
+void Component::Loader::overlay(const string &o)
+{
+       obj.overlays.push_back(o);
+}
+
+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)
+{
+       obj.sources.push_back((obj.package.get_source_directory()/s).str());
+}