void Component::create_build_info()
{
+ BuildInfo final_build_info;
+
const PackageList &pkg_reqs = package.get_required_packages();
PackageList direct_reqs = requires;
direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
level = BuildInfo::DEPENDENCY;
- build_info.update_from((*i)->get_exported_build_info(), level);
+ final_build_info.update_from((*i)->get_exported_build_info(), level);
const PackageList &reqs = (*i)->get_required_packages();
for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
all_reqs.push_back(*j);
}
- build_info.update_from(package.get_build_info());
+ final_build_info.update_from(package.get_build_info());
for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (package.get_source_directory() / *i).str();
+ final_build_info.update_from(build_info);
+ build_info = final_build_info;
+
if(type==LIBRARY || type==MODULE)
if(build_info.libmode<BuildInfo::DYNAMIC)
build_info.libmode = BuildInfo::DYNAMIC;
{
Builder &builder = package.get_builder();
const Toolchain &toolchain = builder.get_toolchain();
- Target *world = builder.get_target("world");
- Target *def_tgt = builder.get_target("default");
PathList source_filenames = collect_source_files();
list<Target *> inst_list;
source = new File(builder, package, source_filenames.front());
Target *result = dcomp.create_target(*source);
- if(&package==builder.get_main_package() && deflt)
- def_tgt->add_dependency(*result);
- else
- world->add_dependency(*result);
+ builder.add_primary_target(*result);
if(install)
inst_list.push_back(result);
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
- if(&package==builder.get_main_package() && deflt)
- def_tgt->add_dependency(**i);
- else
- world->add_dependency(**i);
+ builder.add_primary_target(**i);
if(install)
inst_list.push_back(*i);
}