]> git.tdb.fi Git - builder.git/blobdiff - source/component.cpp
Rewrite dependency finding algorithms in a few classes
[builder.git] / source / component.cpp
index 07cd6ea5aee874df889e4c34c49c77ae12ae5356..6545b28b95c460ed9b1f34b8ca679cd8aa77e677 100644 (file)
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
-#include <msp/strings/lexicalcast.h>
+#include <deque>
+#include <msp/core/algorithm.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
-#include "header.h"
-#include "install.h"
-#include "objectfile.h"
-#include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "staticlibrary.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)
 { }
 
-/**
-Prepares the build information for building.
-*/
+void Component::prepare()
+{
+       for(Package *r: requires)
+               r->prepare();
+}
+
 void Component::create_build_info()
 {
-       build_info.add(pkg.get_build_info());
+       BuildInfo final_build_info;
 
-       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               build_info.add((*i)->get_exported_binfo());
+       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());
+       for(Package *r: direct_reqs)
+               final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY);
 
-       if(type==PROGRAM)
+       Package::Requirements all_reqs = direct_reqs;
+       deque<Package *> queue(direct_reqs.begin(), direct_reqs.end());
+       while(!queue.empty())
        {
-               string strip=pkg.get_config().get_option("strip").value;
-               if(lexical_cast<bool>(strip))
-                       build_info.ldflags.push_back("-s");
+               Package *req = queue.front();
+               queue.pop_front();
+
+               for(Package *r: req->get_required_packages())
+                       if(!any_equals(all_reqs, r))
+                       {
+                               final_build_info.update_from(r->get_exported_build_info(), BuildInfo::CHAINED);
+                               all_reqs.push_back(r);
+                               queue.push_back(r);
+                       }
        }
 
-       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());
-       }
+       final_build_info.update_from(package.get_build_info());
+       final_build_info.update_from(build_info);
+       build_info = final_build_info;
 
-       build_info.unique();
+       for(FS::Path &p: build_info.incpath)
+               p = (package.get_source_directory()/p).str();
+       for(FS::Path &p: build_info.libpath)
+               p = (package.get_source_directory()/p).str();
 }
 
-/**
-Creates all targets needed for building this component.
-*/
-void Component::create_targets() const
+BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
 {
-       Builder &builder=pkg.get_builder();
-       Target *world=builder.get_target("world");
-       Target *def_tgt=builder.get_target("default");
-
-       PathList files=collect_source_files();
-
-       bool build_exe=(type!=HEADERS);
+       // XXX Cache these and check that the directories actually exist before adding them
+       BuildInfo binfo = build_info;
 
-       list<ObjectFile *> objs;
-       list<Target *> inst_tgts;
-       for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+       FS::Path gen_dir = package.get_temp_directory()/"generated";
+       if(FS::descendant_depth(path, gen_dir)>=0)
        {
-               string basename=(*i)[-1];
-               string ext=Path::splitext(basename).ext;
-               if((ext==".cpp" || ext==".c") && build_exe)
-               {
-                       SourceFile *src=new SourceFile(builder, this, i->str());
-
-                       // Compile sources
-                       ObjectFile *obj=new ObjectFile(builder, *this, *src);
-                       objs.push_back(obj);
-               }
-               else if(ext==".h")
-               {
-                       Target *hdr=builder.get_target(i->str());
-                       if(!hdr)
-                               hdr=new Header(builder, this, i->str());
-
-                       // Install headers if requested
-                       if(!install_headers.empty())
-                               inst_tgts.push_back(hdr);
-               }
+               FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
+               binfo.local_incpath.push_back(package.get_source_directory()/subdir);
        }
-
-       if(build_exe)
+       else
        {
-               Executable    *exe=0;
-               StaticLibrary *slib=0;
-               if(type==LIBRARY)
-               {
-                       exe=new SharedLibrary(builder, *this, objs);
-                       slib=new StaticLibrary(builder, *this, objs);
-               }
-               else
-                       exe=new Executable(builder, *this, objs);
+               FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
+               binfo.local_incpath.push_back(gen_dir/subdir);
+       }
 
-               if(&pkg==builder.get_main_package() && deflt)
-               {
-                       def_tgt->add_depend(exe);
-                       if(slib) def_tgt->add_depend(slib);
-               }
-               else
-               {
-                       world->add_depend(exe);
-                       if(slib) world->add_depend(slib);
-               }
+       if(!overlays.empty())
+       {
+               FS::Path dir = FS::dirname(path);
+               string last = FS::basename(dir);
+               if(any_equals(overlays, last))
+                       dir = FS::dirname(dir);
 
-               if(install)
+               if(any_equals(sources, dir))
                {
-                       inst_tgts.push_back(exe);
-                       if(slib)
-                               inst_tgts.push_back(slib);
+                       binfo.local_incpath.push_back(dir);
+                       for(const string &o: overlays)
+                               binfo.local_incpath.push_back(dir/o);
                }
        }
-
-       Target *inst_tgt=builder.get_target("install");
-       for(TargetList::const_iterator i=inst_tgts.begin(); i!=inst_tgts.end(); ++i)
-               inst_tgt->add_depend(new Install(builder, pkg, **i));
+       return binfo;
 }
 
-/**
-Collects all files belonging to the component.
-*/
-PathList Component::collect_source_files() const
+list<FS::Path> Component::collect_source_files() const
 {
-       PathList files;
-       for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       list<FS::Path> files;
+       for(const FS::Path &p: sources)
        {
-               struct stat st;
-               stat(*i, st);
-               if(S_ISDIR(st.st_mode))
+               if(FS::is_dir(p))
                {
-                       list<string> sfiles=list_files(*i);
-                       for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
-                               files.push_back(*i / *j);
+                       list<FS::Path> dirs;
+                       dirs.push_back(p);
+                       for(const string &o: overlays)
+                       {
+                               FS::Path opath = p/o;
+                               if(FS::is_dir(opath))
+                                       dirs.push_back(opath);
+                       }
+                       set<string> overlay_files;
+                       for(auto j=dirs.begin(); j!=dirs.end(); ++j)
+                       {
+                               package.get_builder().get_logger().log("files", format("Traversing %s", *j));
+                               for(const string &f: list_files(*j))
+                               {
+                                       if(j!=dirs.begin())
+                                       {
+                                               if(overlay_files.count(f))
+                                                       continue;
+                                               overlay_files.insert(f);
+                                       }
+                                       FS::Path fn = *j/f;
+                                       if(!FS::is_dir(fn))
+                                               files.push_back(fn);
+                               }
+                       }
                }
                else
-                       files.push_back(*i);
+               {
+                       files.push_back(p);
+                       for(const string &o: overlays)
+                       {
+                               FS::Path opath = FS::dirname(p)/o/FS::basename(p);
+                               if(FS::is_reg(opath))
+                                       files.push_back(opath);
+                       }
+               }
        }
 
        return files;
@@ -163,53 +144,43 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-       comp(c)
+       DataFile::ObjectLoader<Component>(c),
+       ConditionalLoader(c.package, format("%s/%s", c.package.get_name(), c.name))
 {
+       add("overlay",         &Loader::overlay);
        add("source",          &Loader::source);
        add("install",         &Component::install);
-       add("install_headers", &Component::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::source(const string &s)
+void Component::Loader::build_info()
 {
-       comp.sources.push_back(comp.pkg.get_source()/s);
+       load_sub(obj.build_info);
 }
 
-void Component::Loader::require(const string &n)
+void Component::Loader::install_map()
 {
-       Package *req=comp.pkg.get_builder().get_package(n);
-       if(req)
-               comp.requires.push_back(req);
+       load_sub(obj.install_map, obj.package.get_source_directory());
 }
 
-void Component::Loader::modular()
+void Component::Loader::overlay(const string &o)
 {
-       if(comp.type!=PROGRAM)
-               throw Msp::Exception("Only programs can be modular");
-       comp.modular=true;
+       obj.overlays.push_back(o);
 }
 
-void Component::Loader::host(const string &n)
+void Component::Loader::require(const string &n)
 {
-       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->get_modular())
-                               throw Msp::Exception("Module host must be a modular program");
-                       comp.module_host=&*i;
-                       return;
-               }
-
-       throw Msp::Exception("Unknown component");
+       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::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());
 }