Don't use soname for modules

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 606593bda0d88c82d3299e33db6a7a540d1876f4..6600b740332a23dff7a882a0a63e6c99afcbd8ec 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,33 +1,74 @@
+#include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "builder.h"
 #include "component.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), generate_target_path(c)),
-       Binary(b, c, objs),
-       Library(b, &c.get_package(), path, c.get_name()),
-       soname(create_soname(c))
-{ }
+SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
+       Binary(b, p),
+       import_lib(0)
+{
+       libname = FS::basepart(FS::basename(path));
+       if(!libname.compare(0, 3, "lib"))
+               libname = libname.substr(3);
+}
 
-string SharedLibrary::create_soname(const Component &c)
+SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+       Binary(b, c, generate_filename(c), objs),
+       libname(c.get_name()),
+       import_lib(0)
 {
-       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]=='.')
+       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();
+       else
+       {
+               const string &version = component->get_package().get_interface_version();
+               if(!version.empty())
                {
-                       ++dots;
-                       if(dots>=2)
-                               break;
+                       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);
+
+                       install_filename = soname;
                }
+       }
 
-       return format("%s.%s", name, ver.substr(0, i));
+       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)
+{
+       if(comp.get_type()==Component::MODULE)
+               return comp.get_name()+".m";
+       else
+       {
+               const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+               return arch.get_shared_library_patterns().front().apply(comp.get_name());
+       }
+}
+
+void SharedLibrary::set_import_library(ImportLibrary *imp)
+{
+       import_lib = imp;
 }