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;
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);
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)
{
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");
+}