More generic system for installing targets under different names

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index fac651a8e3518737187f817c0d4d14ee2575e036..5fcbe74aa42a6a632d79303557e4bceb767e8abd 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "builder.h"
 #include "component.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -7,35 +8,42 @@
 using namespace std;
 using namespace Msp;
 
+SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
+       Binary(b, p)
+{
+       libname = FS::basepart(FS::basename(path));
+       if(!libname.compare(0, 3, "lib"))
+               libname = libname.substr(3);
+}
+
 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))
+       Binary(b, c, generate_filename(c), objs),
+       libname(c.get_name())
 {
        install_location = "lib";
-       if(comp.get_type()==Component::MODULE)
+       if(component->get_type()==Component::MODULE)
+               install_location /= package->get_name();
+
+       const string &version = component->get_package().get_version();
+       if(!version.empty())
        {
-               install_location += '/';
-               install_location += package->get_name();
+               string::size_type i = 0;
+               for(unsigned dots=0; i<version.size(); ++i)
+                       if(version[i]=='.' && ++dots>=2)
+                               break;
+
+               soname = format("%s.%s", FS::basename(path), version.substr(0, i));
+               install_filename = soname;
        }
 }
 
-string SharedLibrary::create_soname(const Component &c)
+string SharedLibrary::generate_filename(const Component &comp)
 {
-       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));
+       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());
+       }
 }