for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (pkg.get_source() / *i).str();
- if(pkg.get_library_mode()!=DYNAMIC)
+ if(pkg.get_library_mode()<DYNAMIC)
{
for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
}
}
-
- if(type==PROGRAM)
- build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
}
void Component::create_targets() const
/*Target *result = tar.create_target(files, tarname);
Target *tarballs_tgt = builder.get_target("tarballs");
- tarballs_tgt->add_depend(result);*/
+ tarballs_tgt->add_depend(*result);*/
return;
}
Target *result = dcomp.create_target(*source);
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(result);
+ def_tgt->add_depend(*result);
else
- world->add_depend(result);
+ world->add_depend(*result);
if(install)
inst_list.push_back(result);
}
- else
- {
- for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
- {
- string ext = FS::extpart(FS::basename(*i));
- if(ext==".h")
- {
- FileTarget *hdr = builder.get_vfs().get_target(*i);
- if(!hdr)
- hdr = new CSourceFile(builder, *this, *i);
-
- // Install headers if requested
- if(type==HEADERS && install)
- inst_list.push_back(hdr);
- }
- }
- }
if(type==PROGRAM || type==LIBRARY || type==MODULE)
{
for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
{
string ext = FS::extpart(FS::basename(*i));
- const Tool *tool = toolchain.get_tool_for_suffix(ext);
+ const Tool *tool = toolchain.get_tool_for_suffix(ext, true);
if(tool)
{
Target *src = tool->create_source(*this, *i);
- Target *obj = tool->create_target(*src);
- objs.push_back(obj);
+ if(tool->accepts_suffix(ext))
+ {
+ Target *obj = tool->create_target(*src);
+ objs.push_back(obj);
+ }
+
+ if(type==LIBRARY && install && !dynamic_cast<FileTarget *>(src)->get_install_location().empty())
+ inst_list.push_back(src);
}
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(*i);
+ def_tgt->add_depend(**i);
else
- world->add_depend(*i);
+ world->add_depend(**i);
if(install)
inst_list.push_back(*i);
}
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_depend(inst);
+ inst_tgt->add_depend(*inst);
}
}
Component::Loader::Loader(Component &c):
- comp(c)
+ DataFile::ObjectLoader<Component>(c)
{
add("source", &Loader::source);
add("install", &Component::install);
add("default", &Component::deflt);
}
-void Component::Loader::finish()
-{
- if(!inst_hdr.empty())
- {
- Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
- hdrcomp.sources = comp.sources;
- hdrcomp.install = true;
- const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
- }
-}
-
void Component::Loader::source(const string &s)
{
- comp.sources.push_back(s);
+ obj.sources.push_back(s);
}
void Component::Loader::require(const string &n)
{
- Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
+ Package *req = obj.pkg.get_builder().get_package_manager().find_package(n);
if(req)
- comp.requires.push_back(req);
+ obj.requires.push_back(req);
}
void Component::Loader::build_info()
{
- load_sub(comp.build_info);
+ load_sub(obj.build_info);
}
void Component::Loader::install_map()
{
- load_sub(comp.install_map, comp.pkg.get_source());
+ load_sub(obj.install_map, obj.pkg.get_source());
}