Allow requirements for components

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 1fd6b24bfc89676324cd80eb7fe3469c6263b86a..6d80f3b0efc249511eae49e0d41cd0ec1d317172 100644 (file)
--- 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<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+               i->resolve();
+}
+
 void Component::create_build_info()
 {
        build_info.add(pkg.get_build_info());
+
+       for(list<PackageRef>::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();
 }
 
@@ -22,7 +37,8 @@ Component::Loader::Loader(Component &c):
        add("source",          &Loader::source);
        add("install",         &Component::install);
        add("install_headers", &Component::install_headers);
-       add("cflag",           &Loader::cflag);
+       add("build_info",      &Loader::build_info);
+       add("require",         &Loader::require);
 }
 
 void Component::Loader::source(const string &s)
@@ -30,7 +46,12 @@ void Component::Loader::source(const string &s)
        comp.sources.push_back(comp.pkg.get_source()/s);
 }
 
-void Component::Loader::cflag(const string &f)
+void Component::Loader::require(const string &n)
+{
+       comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n));
+}
+
+void Component::Loader::build_info()
 {
-       comp.build_info.cflags.push_back(f);
+       load_sub(comp.build_info);
 }