X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=963625122005f7fdff8837ba5372deaf0cd4f02a;hb=b45cfe5e437ca79bb3176618769628c58c0734d1;hp=fdc0a6d02d572d945dbeb376e6f4a2d63dd217fc;hpb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index fdc0a6d..9636251 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,102 +1,180 @@ -#include +#include +#include +#include +#include +#include +#include "builder.h" #include "component.h" -#include "package.h" +#include "sourcepackage.h" using namespace std; +using namespace Msp; -Component::Component(Package &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) { } -/** -Tries to resolve all references to packages. -*/ -void Component::resolve_refs() +void Component::prepare() { - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) - i->resolve(); + for(Package *r: requires) + r->prepare(); } -/** -Prepares the build information for building. -*/ void Component::create_build_info() { - build_info.add(pkg.get_build_info()); + BuildInfo final_build_info; - for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + 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()); + + Package::Requirements all_reqs = direct_reqs; + for(Package *r: all_reqs) + { + BuildInfo::UpdateLevel level = BuildInfo::CHAINED; + if(any_equals(direct_reqs, r)) + level = BuildInfo::DEPENDENCY; + final_build_info.update_from(r->get_exported_build_info(), level); + + for(Package *q: r->get_required_packages()) + if(!any_equals(all_reqs, q)) + all_reqs.push_back(q); + } + + final_build_info.update_from(package.get_build_info()); + final_build_info.update_from(build_info); + build_info = final_build_info; + + 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(); +} + +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; + + FS::Path gen_dir = package.get_temp_directory()/"generated"; + if(FS::descendant_depth(path, gen_dir)>=0) + { + FS::Path subdir = FS::dirname(FS::relative(path, gen_dir)); + binfo.local_incpath.push_back(package.get_source_directory()/subdir); + } + else { - if(!i->get_package()) - continue; - //i->get_package()->create_build_info(); - build_info.add(i->get_package()->get_exported_binfo()); + FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory())); + binfo.local_incpath.push_back(gen_dir/subdir); } - if(modular) + if(!overlays.empty()) { - build_info.ldflags.push_back("-rdynamic"); - build_info.libs.push_back("dl"); + FS::Path dir = FS::dirname(path); + string last = FS::basename(dir); + if(any_equals(overlays, last)) + dir = FS::dirname(dir); + + if(any_equals(sources, dir)) + { + binfo.local_incpath.push_back(dir); + for(const string &o: overlays) + binfo.local_incpath.push_back(dir/o); + } } - else if(module_host) + return binfo; +} + +Component::SourceList Component::collect_source_files() const +{ + SourceList files; + for(const FS::Path &p: sources) { - 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()); + if(FS::is_dir(p)) + { + SourceList 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 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(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); + } + } } - build_info.unique(); + return files; } + Component::Loader::Loader(Component &c): - comp(c) + DataFile::ObjectLoader(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() { - comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n)); + 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()); }