Don't use soname for modules

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 5fcbe74aa42a6a632d79303557e4bceb767e8abd..6600b740332a23dff7a882a0a63e6c99afcbd8ec 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -2,6 +2,7 @@
 #include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -9,7 +10,8 @@ using namespace std;
 using namespace Msp;
 
 SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
-       Binary(b, p)
+       Binary(b, p),
+       import_lib(0)
 {
        libname = FS::basepart(FS::basename(path));
        if(!libname.compare(0, 3, "lib"))
@@ -18,23 +20,41 @@ 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())
+       libname(c.get_name()),
+       import_lib(0)
 {
-       install_location = "lib";
+       if(builder.get_current_arch().get_system()=="windows")
+               install_location = "bin";
+       else
+               install_location = "lib";
+
        if(component->get_type()==Component::MODULE)
                install_location /= package->get_name();
-
-       const string &version = component->get_package().get_version();
-       if(!version.empty())
+       else
        {
-               string::size_type i = 0;
-               for(unsigned dots=0; i<version.size(); ++i)
-                       if(version[i]=='.' && ++dots>=2)
-                               break;
+               const string &version = component->get_package().get_interface_version();
+               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));
+                       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);
+                       }
+                       else
+                               soname = format("%s.%s", pattern.apply(component->get_name()), version);
 
-               soname = format("%s.%s", FS::basename(path), version.substr(0, i));
-               install_filename = soname;
+                       install_filename = soname;
+               }
        }
+
+       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               (*i)->set_used_in_shared_library(true);
 }
 
 string SharedLibrary::generate_filename(const Component &comp)
@@ -47,3 +67,8 @@ string SharedLibrary::generate_filename(const Component &comp)
                return arch.get_shared_library_patterns().front().apply(comp.get_name());
        }
 }
+
+void SharedLibrary::set_import_library(ImportLibrary *imp)
+{
+       import_lib = imp;
+}