Deprecate the headers component type

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ab66c0056651cbfddaa768fed2dbb47577779870..904e2b49e5524a54434bf9a600c1644264ad2ab0 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -53,9 +53,7 @@ unsigned SourcePackage::get_install_flags()
                        if(i->get_type()==Component::PROGRAM)
                                flags |= BIN;
                        else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-                               flags |= LIB;
-                       else if(i->get_type()==Component::HEADERS)
-                               flags |= INCLUDE;
+                               flags |= LIB|INCLUDE;
                }
 
        return flags;
@@ -233,7 +231,7 @@ void SourcePackage::create_targets()
        for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
        {
                i->create_targets();
-               if(i->get_type()==Component::LIBRARY || i->get_type()==Component::HEADERS)
+               if(i->get_type()==Component::LIBRARY)
                        pc_needed = true;
        }
 
@@ -256,7 +254,7 @@ SourcePackage::Loader::Loader(Package &p):
        add("program",     &Loader::component<Component::PROGRAM>);
        add("library",     &Loader::component<Component::LIBRARY>);
        add("module",      &Loader::component<Component::MODULE>);
-       add("headers",     &Loader::component<Component::HEADERS>);
+       add("headers",     &Loader::headers);
        add("install",     &Loader::component<Component::INSTALL>);
        add("datafile",    &Loader::component<Component::DATAFILE>);
        add("tarball",     &Loader::tarball);
@@ -267,6 +265,21 @@ void SourcePackage::Loader::finish()
 {
        SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
        spkg.components.sort(component_sort);
+
+       for(map<string, string>::const_iterator i=install_map.begin(); i!=install_map.end(); ++i)
+       {
+               for(ComponentList::iterator j=spkg.components.begin(); j!=spkg.components.end(); ++j)
+               {
+                       const StringList &sources = j->get_sources();
+                       for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
+                       {
+                               if(!i->first.compare(0, k->size(), *k))
+                               {
+                                       const_cast<InstallMap &>(j->get_install_map()).add_mapping(spkg.source/i->first, i->second);
+                               }
+                       }
+               }
+       }
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
@@ -300,6 +313,17 @@ void SourcePackage::Loader::build_info()
        load_sub(static_cast<SourcePackage &>(pkg).build_info);
 }
 
+void SourcePackage::Loader::headers(const string &n)
+{
+       IO::print("%s: Note: headers components are deprecated\n", get_source());
+       SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
+       Component comp(spkg, Component::LIBRARY, n);
+       load_sub(comp);
+       const StringList &sources = comp.get_sources();
+       for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+               install_map[*i] = "include/"+comp.get_name();
+}
+
 void SourcePackage::Loader::tarball(const string &n)
 {
        SourcePackage &spkg = static_cast<SourcePackage &>(pkg);