Use mspio for all I/O operations

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index dd33941c7ed20f6b08b0bf8e4929f26ddf5c57fe..6bef63651d9ec88f42fbe639010bc9a7935cc73b 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
@@ -109,7 +110,7 @@ void Component::create_targets() const
                                hdr=new Header(builder, this, i->str());
 
                        // Install headers if requested
-                       if(!install_headers.empty())
+                       if(type==HEADERS && install)
                                inst_tgts.push_back(hdr);
                }
        }
@@ -174,7 +175,7 @@ Component::Loader::Loader(Component &c):
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
-       add("install_headers", &Component::install_headers);
+       add("install_headers", &Loader::install_headers);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("modular",         &Loader::modular);
@@ -182,6 +183,17 @@ Component::Loader::Loader(Component &c):
        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(comp.pkg.get_source()/s);
@@ -216,6 +228,18 @@ void Component::Loader::host(const string &n)
        throw Msp::Exception("Unknown component");
 }
 
+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);