]> 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 5f6237e743f88f37d4f8929f59794e65e79e1c41..a42b81cded44229d877882c535b11c2982ecfb77 100644 (file)
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <algorithm>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #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 "executable.h"
-#include "file.h"
-#include "header.h"
-#include "install.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "staticlibrary.h"
-#include "tarball.h"
-#include "target.h"
 
 using namespace std;
 using namespace Msp;
 
-Component::Component(SourcePackage &p, Type t, const string &n):
-       pkg(p),
-       type(t),
+Component::Component(SourcePackage &p, const string &n):
+       package(p),
        name(n),
        install(false),
-       module_host(0),
-       modular(false),
        deflt(true)
 { }
 
-void Component::create_build_info()
+void Component::prepare()
 {
-       build_info.add(pkg.get_build_info());
-
-       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               build_info.add((*i)->get_exported_binfo());
-
-       for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
-               *i=(pkg.get_source() / *i).str();
-       for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
-               *i=(pkg.get_source() / *i).str();
-
-       if(pkg.get_library_mode()!=DYNAMIC)
-       {
-               // XXX This may pull in some unnecessary libpaths too.  More thought required.
-               PackageList reqs=pkg.collect_requires();
-               for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i)
-               {
-                       const BuildInfo &ebi=(*i)->get_exported_binfo();
-                       build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
-               }
-       }
-
-       if(type==PROGRAM)
-       {
-               string strip=pkg.get_config().get_option("strip").value;
-               if(lexical_cast<bool>(strip))
-                       build_info.ldflags.push_back("-s");
-       }
-
-       if(modular)
-       {
-               build_info.ldflags.push_back("-rdynamic");
-               build_info.libs.push_back("dl");
-       }
-       else if(module_host)
-       {
-               const PathList &host_src=module_host->get_sources();
-               for(PathList::const_iterator i=host_src.begin(); i!=host_src.end(); ++i)
-                       build_info.incpath.push_back(i->str());
-       }
-
-       build_info.unique();
+       for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+               (*i)->prepare();
 }
 
-void Component::create_targets() const
+void Component::create_build_info()
 {
-       Builder &builder=pkg.get_builder();
-       Target *world=builder.get_target("world");
-       Target *def_tgt=builder.get_target("default");
+       BuildInfo final_build_info;
 
-       PathList files=collect_source_files();
+       const Package::Requirements &pkg_reqs = package.get_required_packages();
+       Package::Requirements direct_reqs = requires;
+       direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
 
-       if(type==TARBALL)
+       Package::Requirements all_reqs = direct_reqs;
+       for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
-               string tarname=name;
-               if(name=="@src")
-                       tarname=pkg.get_name()+"-"+pkg.get_version();
-               TarBall *result=new TarBall(builder, pkg, tarname);
-
-               if(name=="@src")
-               {
-                       const TargetMap &targets=builder.get_targets();
-                       for(TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-                               if(i->second->get_package()==&pkg && !i->second->is_buildable())
-                                       result->add_depend(i->second);
-                       files.push_back(pkg.get_source()/"Build");
-               }
-
-               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-               {
-                       FileTarget *ft;
-                       if(Target *tgt=builder.get_target(i->str()))
-                               ft=dynamic_cast<FileTarget *>(tgt);
-                       else
-                               ft=new File(builder, *i);
-                       result->add_depend(ft);
-               }
-
-               Target *tarbls_tgt=builder.get_target("tarballs");
-               tarbls_tgt->add_depend(result);
-
-               return;
+               BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
+               if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
+                       level = BuildInfo::DEPENDENCY;
+               final_build_info.update_from((*i)->get_exported_build_info(), level);
+
+               const Package::Requirements &reqs = (*i)->get_required_packages();
+               for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
+                       if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end())
+                               all_reqs.push_back(*j);
        }
 
-       list<FileTarget *> inst_list;
-       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-       {
-               string ext=FS::extpart(FS::basename(*i));
-               if(ext==".h")
-               {
-                       FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
-                       if(!hdr)
-                               hdr=new Header(builder, this, i->str());
+       final_build_info.update_from(package.get_build_info());
+       final_build_info.update_from(build_info);
+       build_info = final_build_info;
 
-                       // Install headers if requested
-                       if(type==HEADERS && install)
-                               inst_list.push_back(hdr);
-               }
-       }
+       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();
+}
 
-       if(type==PROGRAM || type==LIBRARY || type==MODULE)
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
+{
+       // XXX Cache these and check that the directories actually exist before adding them
+       BuildInfo binfo = build_info;
+       if(!overlays.empty())
        {
-               list<ObjectFile *> objs;
-               for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
-               {
-                       string ext=FS::extpart(FS::basename(*i));
-                       if((ext==".cpp" || ext==".cc" || ext==".c"))
+               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)
                        {
-                               SourceFile *src=new SourceFile(builder, this, i->str());
-                               ObjectFile *obj=new ObjectFile(builder, *this, *src);
-                               objs.push_back(obj);
+                               dir = FS::dirname(dir);
+                               break;
                        }
-               }
 
-               list<FileTarget *> results;
-               if(type==LIBRARY)
-               {
-                       results.push_back(new SharedLibrary(builder, *this, objs));
-                       results.push_back(new StaticLibrary(builder, *this, objs));
-               }
-               else
-                       results.push_back(new Executable(builder, *this, objs));
-
-               for(list<FileTarget *>::const_iterator i=results.begin(); i!=results.end(); ++i)
-               {
-                       if(&pkg==builder.get_main_package() && deflt)
-                               def_tgt->add_depend(*i);
-                       else
-                               world->add_depend(*i);
-                       if(install)
-                               inst_list.push_back(*i);
-               }
+               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);
+                       }
        }
-
-       Target *inst_tgt=builder.get_target("install");
-       for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-               inst_tgt->add_depend(new Install(builder, pkg, **i));
+       return binfo;
 }
 
-PathList Component::collect_source_files() const
+Component::SourceList Component::collect_source_files() const
 {
-       PathList files;
-       for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       SourceList files;
+       for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
        {
-               if(FS::is_dir(*i))
+               FS::Path path(*i);
+               if(FS::is_dir(path))
                {
-                       list<string> sfiles=list_files(*i);
-                       for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-                               files.push_back(*i / *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(*i);
+               {
+                       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;
@@ -197,76 +133,64 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-       comp(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_headers", &Loader::install_headers);
+       add("install_map",     &Loader::install_map);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
-       add("modular",         &Loader::modular);
-       add("host",            &Loader::host);
        add("default",         &Component::deflt);
 }
 
-void Component::Loader::finish()
+void Component::Loader::build_info()
 {
-       if(!inst_hdr.empty())
-       {
-               Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
-               hdrcomp.sources=comp.sources;
-               hdrcomp.install=true;
-               const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
-       }
+       load_sub(obj.build_info);
 }
 
-void Component::Loader::source(const string &s)
+void Component::Loader::if_arch(const string &cond)
 {
-       comp.sources.push_back(comp.pkg.get_source()/s);
+       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::require(const string &n)
+void Component::Loader::if_feature(const string &cond)
 {
-       Package *req=comp.pkg.get_builder().get_package(n);
-       if(req)
-               comp.requires.push_back(req);
+       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::modular()
+void Component::Loader::install_map()
 {
-       if(comp.type!=PROGRAM)
-               throw Exception("Only programs can be modular");
-       comp.modular=true;
+       load_sub(obj.install_map, obj.package.get_source_directory());
 }
 
-void Component::Loader::host(const string &n)
+void Component::Loader::overlay(const string &o)
 {
-       const ComponentList &comps=comp.pkg.get_components();
-       for(ComponentList::const_iterator i=comps.begin(); i!=comps.end(); ++i)
-               if(i->get_name()==n)
-               {
-                       if(i->get_type()!=PROGRAM || !i->is_modular())
-                               throw Exception("Module host must be a modular program");
-                       comp.module_host=&*i;
-                       return;
-               }
-
-       throw KeyError("Unknown component", n);
+       obj.overlays.push_back(o);
 }
 
-void Component::Loader::install_headers(const string &p)
+void Component::Loader::require(const string &n)
 {
-       IO::print("%s: Note: install_headers is deprecated\n", get_source());
-       if(comp.type==HEADERS)
-       {
-               comp.name=p;
-               comp.install=true;
-       }
+       Package *req = obj.package.get_builder().get_package_manager().find_package(n);
+       if(req)
+               obj.requires.push_back(req);
        else
-               inst_hdr=p;
+               obj.problems.push_back(format("Required package %s not found", n));
 }
 
-void Component::Loader::build_info()
+void Component::Loader::source(const string &s)
 {
-       load_sub(comp.build_info);
+       obj.sources.push_back((obj.package.get_source_directory()/s).str());
 }