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;
const Toolchain &toolchain = builder.get_toolchain();
SourceList source_filenames = collect_source_files();
- list<Target *> inst_list;
string inst_loc;
if(type==TARBALL)
}
else if(type==INSTALL)
{
- inst_loc = name;
+ Target *inst = builder.get_target("install");
+ const Tool © = toolchain.get_tool("CP");
for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
FileTarget *ft;
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)
builder.add_primary_target(*result);
if(install)
- inst_list.push_back(result);
+ builder.add_installed_target(*result);
}
if(type==PROGRAM || type==LIBRARY || type==MODULE)
}
if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
- inst_list.push_back(src);
+ builder.add_installed_target(*src);
}
}
{
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 © = 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
obj.uses.push_back(&*i);
return;
}
- error(format("Unknown library component '%s'", n));
+ throw invalid_argument("Component::Loader::use");
}