Build shared libraries directly to a versioned name

[builder.git] / source / lib / sharedlibrary.cpp

diff --git a/source/lib/sharedlibrary.cpp b/source/lib/sharedlibrary.cpp
index aae366332c974944cf2503949a09bdab164e63aa..bd8ee260530ce6c226f54ddb74295d4f83dda3e1 100644 (file)
--- a/source/lib/sharedlibrary.cpp
+++ b/source/lib/sharedlibrary.cpp
@@ -35,22 +35,6 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const vector<Object
        const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(*component);
        if(bcomp.get_type()==BinaryComponent::MODULE)
                install_location /= package->get_name();
-       else
-       {
-               const string &version = component->get_package().get_interface_version();
-               if(!version.empty())
-               {
-                       const Architecture &arch = builder.get_current_arch();
-                       if(arch.get_system()=="windows")
-                               soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, version));
-                       else if(arch.get_system()=="darwin")
-                               soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
-                       else
-                               soname = format("%s.%s", arch.create_filename<SharedLibrary>(libname), version);
-
-                       install_filename = soname;
-               }
-       }
 
        for(ObjectFile *o: objects)
                o->set_used_in_shared_library(true);
@@ -63,8 +47,20 @@ string SharedLibrary::generate_filename(const Component &comp)
                return comp.get_name()+".dlm";
        else
        {
-               const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-               return arch.create_filename<SharedLibrary>(comp.get_name());
+               const SourcePackage &pkg = comp.get_package();
+               const Architecture &arch = pkg.get_builder().get_current_arch();
+               const string &version = pkg.get_interface_version();
+               if(!version.empty())
+               {
+                       if(arch.get_system()=="windows")
+                               return arch.create_filename<SharedLibrary>(format("%s-%s", comp.get_name(), version));
+                       else if(arch.get_system()=="darwin")
+                               return arch.create_filename<SharedLibrary>(format("%s.%s", comp.get_name(), version));
+                       else
+                               return format("%s.%s", arch.create_filename<SharedLibrary>(comp.get_name()), version);
+               }
+               else
+                       return arch.create_filename<SharedLibrary>(comp.get_name());
        }
 }