Remove dead code

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index cc4796cdee867cd9d9aea23d311951d4f091965a..902cf49abfe6d1142d0d4c50819a7cc103e0edaa 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -61,9 +61,9 @@ void Component::create_build_info()
 
        build_info.update_from(pkg.get_build_info());
 
-       for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
-       for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
 
        if(pkg.get_library_mode()!=DYNAMIC)
@@ -77,8 +77,6 @@ void Component::create_build_info()
 
        if(type==PROGRAM)
                build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
-
-       build_info.unique();
 }
 
 void Component::create_targets() const
@@ -252,22 +250,12 @@ Component::Loader::Loader(Component &c):
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
+       add("install_map",     &Loader::install_map);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("default",         &Component::deflt);
 }
 
-void Component::Loader::finish()
-{
-       if(!inst_hdr.empty())
-       {
-               Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
-               hdrcomp.sources = comp.sources;
-               hdrcomp.install = true;
-               const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
-       }
-}
-
 void Component::Loader::source(const string &s)
 {
        comp.sources.push_back(s);
@@ -275,7 +263,7 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-       Package *req = comp.pkg.get_builder().get_package(n);
+       Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
        if(req)
                comp.requires.push_back(req);
 }
@@ -284,3 +272,8 @@ void Component::Loader::build_info()
 {
        load_sub(comp.build_info);
 }
+
+void Component::Loader::install_map()
+{
+       load_sub(comp.install_map, comp.pkg.get_source());
+}