Have SourcePackage generate the interface version

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 4a889cb1750903209638a2cb2b8d8b3945847793..db78917c70fdf63fe1aef7fb95fa599629ca34f9 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -68,6 +68,19 @@ void Component::create_build_info()
        final_build_info.update_from(build_info);
        build_info = final_build_info;
 
+       for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
+       {
+               /* Select an include path that contains all the sources for this and the
+               used component.  This should produce a sensible result in most cases. */
+               FS::Path base;
+               for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
+                       base = base.empty() ? *j : FS::common_ancestor(base, *j);
+               const SourceList &use_sources = (*i)->get_sources();
+               for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
+                       base = FS::common_ancestor(base, *j);
+               build_info.incpath.push_back(base);
+       }
+
        if(type==LIBRARY || type==MODULE)
                if(build_info.libmode<BuildInfo::DYNAMIC)
                        build_info.libmode = BuildInfo::DYNAMIC;
@@ -88,7 +101,6 @@ void Component::create_targets() const
        const Toolchain &toolchain = builder.get_toolchain();
 
        SourceList source_filenames = collect_source_files();
-       list<Target *> inst_list;
 
        string inst_loc;
        if(type==TARBALL)
@@ -125,7 +137,8 @@ void Component::create_targets() const
        }
        else if(type==INSTALL)
        {
-               inst_loc = name;
+               Target *inst = builder.get_target("install");
+               const Tool &copy = toolchain.get_tool("CP");
                for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        FileTarget *ft;
@@ -133,7 +146,7 @@ void Component::create_targets() const
                                ft = dynamic_cast<FileTarget *>(tgt);
                        else
                                ft = new File(builder, package, *i);
-                       inst_list.push_back(ft);
+                       inst->add_dependency(*copy.create_target(*ft, name));
                }
        }
        else if(type==DATAFILE)
@@ -149,7 +162,7 @@ void Component::create_targets() const
 
                builder.add_primary_target(*result);
                if(install)
-                       inst_list.push_back(result);
+                       builder.add_installed_target(*result);
        }
 
        if(type==PROGRAM || type==LIBRARY || type==MODULE)
@@ -172,7 +185,7 @@ void Component::create_targets() const
                                }
 
                                if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-                                       inst_list.push_back(src);
+                                       builder.add_installed_target(*src);
                        }
                }
 
@@ -190,21 +203,31 @@ void Component::create_targets() const
                else
                        results.push_back(linker.create_target(objs));
 
+               const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies();
+               for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
+               {
+                       /* The world target depends on all primary targets; look for the
+                       static library belonging to the component.  This is a bit roundabout
+                       way but gets the job done. */
+                       bool found = false;
+                       for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j)
+                               if((*j)->get_component()==*i && dynamic_cast<StaticLibrary *>(*j))
+                               {
+                                       results.front()->add_dependency(**j);
+                                       found = true;
+                                       break;
+                               }
+                       if(!found)
+                               builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name));
+               }
+
                for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
                {
                        builder.add_primary_target(**i);
                        if(install)
-                               inst_list.push_back(*i);
+                               builder.add_installed_target(**i);
                }
        }
-
-       Target *inst_tgt = builder.get_target("install");
-       const Tool &copy = toolchain.get_tool("CP");
-       for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
-       {
-               Target *inst = copy.create_target(**i, inst_loc);
-               inst_tgt->add_dependency(*inst);
-       }
 }
 
 Component::SourceList Component::collect_source_files() const
@@ -237,6 +260,7 @@ Component::Loader::Loader(Component &c):
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
        add("default",         &Component::deflt);
+       add("use",             &Loader::use);
 }
 
 void Component::Loader::source(const string &s)
@@ -260,3 +284,15 @@ void Component::Loader::install_map()
 {
        load_sub(obj.install_map, obj.package.get_source_directory());
 }
+
+void Component::Loader::use(const string &n)
+{
+       const SourcePackage::ComponentList &components = obj.package.get_components();
+       for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+               if(i->get_name()==n && i->get_type()==LIBRARY)
+               {
+                       obj.uses.push_back(&*i);
+                       return;
+               }
+       throw invalid_argument("Component::Loader::use");
+}