Make BuildInfo able to handle chained dependencies

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 1eb93ceeee357a80501643d8d0053ae07edbaf8f..7db9880c051b52633310b4bddfacf04b867283c7 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -48,15 +48,10 @@ void Component::create_build_info()
        PackageList all_reqs = direct_reqs;
        for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
+               BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
                if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
-                       build_info.update_from((*i)->get_exported_binfo());
-               else
-               {
-                       const BuildInfo &ebi = (*i)->get_exported_binfo();
-                       build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
-                       build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
-                       build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
-               }
+                       level = BuildInfo::DEPENDENCY;
+               build_info.update_from((*i)->get_exported_binfo(), level);
 
                const PackageList &reqs = (*i)->get_requires();
                for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
@@ -265,11 +260,8 @@ Component::Loader::Loader(Component &c):
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
-       add("install_headers", &Loader::install_headers);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
-       add("modular",         &Loader::modular);
-       add("host",            &Loader::host);
        add("default",         &Component::deflt);
 }
 
@@ -296,30 +288,6 @@ void Component::Loader::require(const string &n)
                comp.requires.push_back(req);
 }
 
-void Component::Loader::modular()
-{
-       IO::print("%s: Note: modular is deprecated\n", get_source());
-       comp.build_info.ldflags.push_back("-rdynamic");
-       comp.build_info.libs.push_back("dl");
-}
-
-void Component::Loader::host(const string &)
-{
-       IO::print("%s: Note: host is deprecated\n", get_source());
-}
-
-void Component::Loader::install_headers(const string &p)
-{
-       IO::print("%s: Note: install_headers is deprecated\n", get_source());
-       if(comp.type==HEADERS)
-       {
-               comp.name = p;
-               comp.install = true;
-       }
-       else
-               inst_hdr = p;
-}
-
 void Component::Loader::build_info()
 {
        load_sub(comp.build_info);