Have SourcePackage generate the interface version

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 9f983ef1d666fc7a690ed17da7a7cdb135e7ccaf..56f9b32d3e09d5056717faf93d663b57d80648ec 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -18,14 +18,23 @@ SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
 
 SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
        Binary(b, c, generate_filename(c), objs),
-       libname(c.get_name()),
-       soname(create_soname(c))
+       libname(c.get_name())
 {
        install_location = "lib";
        if(component->get_type()==Component::MODULE)
+               install_location /= package->get_name();
+
+       const string &version = component->get_package().get_interface_version();
+       if(!version.empty())
        {
-               install_location += '/';
-               install_location += package->get_name();
+               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));
+               else
+                       soname = format("%s.%s", pattern.apply(component->get_name()), version);
+
+               install_filename = soname;
        }
 }
 
@@ -39,22 +48,3 @@ string SharedLibrary::generate_filename(const Component &comp)
                return arch.get_shared_library_patterns().front().apply(comp.get_name());
        }
 }
-
-string SharedLibrary::create_soname(const Component &c)
-{
-       const string &ver = c.get_package().get_version();
-       if(ver.empty())
-               return string();
-
-       unsigned dots = 0;
-       unsigned i = 0;
-       for(; i<ver.size(); ++i)
-               if(ver[i]=='.')
-               {
-                       ++dots;
-                       if(dots>=2)
-                               break;
-               }
-
-       return format("%s.%s", FS::basename(path), ver.substr(0, i));
-}