if(!version.empty())
{
const Architecture &arch = builder.get_current_arch();
- const Pattern &pattern = arch.get_shared_library_patterns().front();
if(arch.get_system()=="windows")
- soname = pattern.apply(format("%s-%s", component->get_name(), version));
+ soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, version));
else if(arch.get_system()=="darwin")
- {
- string filename = pattern.apply(component->get_name());
- string base = FS::basepart(filename);
- string ext = FS::extpart(filename);
- soname = format("%s.%s%s", base, version, ext);
- }
+ soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
else
- soname = format("%s.%s", pattern.apply(component->get_name()), version);
+ soname = format("%s.%s", arch.create_filename<SharedLibrary>(libname), version);
install_filename = soname;
}
}
- for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
- (*i)->set_used_in_shared_library(true);
+ for(ObjectFile *o: objects)
+ o->set_used_in_shared_library(true);
}
string SharedLibrary::generate_filename(const Component &comp)
{
const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(comp);
if(bcomp.get_type()==BinaryComponent::MODULE)
- return comp.get_name()+".m";
+ return comp.get_name()+".dlm";
else
{
const Architecture &arch = comp.get_package().get_builder().get_current_arch();
- return arch.get_shared_library_patterns().front().apply(comp.get_name());
+ return arch.create_filename<SharedLibrary>(comp.get_name());
}
}