X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=bebe3f7790f4c6b20d874a6208e40583f2d6f083;hb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;hp=27a4c53c08805db4e23e2bdbbb186ba9c6ca018d;hpb=09325a99816a966bc17a0ec9a0a197efc6ce0349;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 27a4c53..bebe3f7 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -1,104 +1,173 @@ -#include +#include +#include +#include +#include +#include +#include "builder.h" #include "component.h" -#include "package.h" +#include "sourcepackage.h" using namespace std; +using namespace Msp; -#include - -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::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->prepare(); } -/** -Prepares the build information for building. -*/ void Component::create_build_info() { - build_info.add(pkg.get_build_info()); + BuildInfo final_build_info; + + 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(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i) + Package::Requirements all_reqs = direct_reqs; + for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { - if(!i->get_package()) - continue; - //i->get_package()->create_build_info(); - build_info.add(i->get_package()->get_exported_binfo()); + 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); } - if(modular) + 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(); +} + +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()) { - build_info.ldflags.push_back("-rdynamic"); - build_info.libs.push_back("dl"); + 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) + { + dir = FS::dirname(dir); + break; + } + + 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); + } } - else if(module_host) + return binfo; +} + +Component::SourceList Component::collect_source_files() const +{ + SourceList files; + for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) { - 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()); + FS::Path path(*i); + if(FS::is_dir(path)) + { + 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 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 sfiles = list_files(*j); + for(list::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); + } + } } - 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()); }