Install headers of non-installed components in a staging directory

[builder.git] / source / lib / sourcepackage.cpp

diff --git a/source/lib/sourcepackage.cpp b/source/lib/sourcepackage.cpp
index 1af2aa693e148831c09f72e327c349f82c0129af..dabda21c99735ec0983171ccba76682848044c87 100644 (file)
--- a/source/lib/sourcepackage.cpp
+++ b/source/lib/sourcepackage.cpp
@@ -65,6 +65,11 @@ FS::Path SourcePackage::get_output_directory() const
                return source_dir/arch.get_name();
 }
 
+FS::Path SourcePackage::get_staging_directory() const
+{
+       return get_temp_directory()/"staging";
+}
+
 const Component &SourcePackage::get_component(const string &n) const
 {
        auto i = find_if(components, [&n](const Component *c){ return c->get_name()==n; });
@@ -97,8 +102,9 @@ void SourcePackage::do_prepare()
        final_build_info.update_from(build_info);
        build_info = final_build_info;
 
-       build_info.incpath.push_back((builder.get_prefix()/"include").str());
-       build_info.libpath.push_back((builder.get_prefix()/"lib").str());
+       build_info.incpath.push_back(get_staging_directory()/"include");
+       build_info.incpath.push_back(builder.get_prefix()/"include");
+       build_info.libpath.push_back(builder.get_prefix()/"lib");
 
        for(const Feature &f: features)
        {
@@ -155,6 +161,7 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o):
 {
        add("build_info",  &Loader::build_info);
        add("description", &SourcePackage::description);
+       add("export",      &Loader::exported);
        add("feature",     &Loader::feature);
        add("generate",    &Loader::generate);
        add("install",     &Loader::component<InstallComponent>);
@@ -182,6 +189,12 @@ void SourcePackage::Loader::finish()
        }
 }
 
+void SourcePackage::Loader::exported()
+{
+       ExportLoader ldr(obj);
+       load_sub_with(ldr);
+}
+
 void SourcePackage::Loader::feature(const string &n, const string &d)
 {
        Feature feat(n);
@@ -237,3 +250,18 @@ void SourcePackage::Loader::version(const string &v)
                        break;
        obj.interface_version = obj.version.substr(0, i);
 }
+
+
+SourcePackage::ExportLoader::ExportLoader(SourcePackage &p):
+       ObjectLoader<SourcePackage>(p)
+{
+       add("build_info", &ExportLoader::build_info);
+}
+
+void SourcePackage::ExportLoader::build_info()
+{
+       BuildInfo bi;
+       load_sub(bi);
+       obj.build_info.update_from(bi);
+       obj.export_binfo.update_from(bi);
+}