X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=6d80f3b0efc249511eae49e0d41cd0ec1d317172;hb=e71eaecb9a31304fe5e096ea29660ea25c1bfa9f;hp=e0630e6cf8a69547ecb27f6c845f5daa6857f041;hpb=4c1d94fb9b70157f9c44b7feaf29ec585ae29276;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index e0630e6..6d80f3b 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -10,9 +10,24 @@ Component::Component(Package &p, Type t, const string &n): install(false) { } +void Component::resolve_refs() +{ + for(list::iterator i=requires.begin(); i!=requires.end(); ++i) + i->resolve(); +} + void Component::create_build_info() { build_info.add(pkg.get_build_info()); + + for(list::iterator i=requires.begin(); i!=requires.end(); ++i) + { + if(!i->get_package()) + continue; + i->get_package()->create_build_info(); + build_info.add(i->get_package()->get_exported_binfo()); + } + build_info.unique(); } @@ -23,6 +38,7 @@ Component::Loader::Loader(Component &c): add("install", &Component::install); add("install_headers", &Component::install_headers); add("build_info", &Loader::build_info); + add("require", &Loader::require); } void Component::Loader::source(const string &s) @@ -30,6 +46,11 @@ void Component::Loader::source(const string &s) comp.sources.push_back(comp.pkg.get_source()/s); } +void Component::Loader::require(const string &n) +{ + comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n)); +} + void Component::Loader::build_info() { load_sub(comp.build_info);