More flexible way to manage filename patterns

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 06a99442b2fb47377044546d1646d7d599da5dcb..5e479f3c9f652f64c03a9ab3eb472ae645c807ed 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,7 +1,8 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "binarycomponent.h"
 #include "builder.h"
-#include "component.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -22,32 +23,44 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
        libname(c.get_name()),
        import_lib(0)
 {
-       install_location = "lib";
-       if(component->get_type()==Component::MODULE)
-               install_location /= package->get_name();
+       if(builder.get_current_arch().get_system()=="windows")
+               install_location = "bin";
+       else
+               install_location = "lib";
 
-       const string &version = component->get_package().get_interface_version();
-       if(!version.empty())
+       const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(*component);
+       if(bcomp.get_type()==BinaryComponent::MODULE)
+               install_location /= package->get_name();
+       else
        {
-               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;
+               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(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";
+       const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(comp);
+       if(bcomp.get_type()==BinaryComponent::MODULE)
+               return comp.get_name()+".dlm";
        else
        {
                const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-               return arch.get_shared_library_patterns().front().apply(comp.get_name());
+               return arch.create_filename<SharedLibrary>(comp.get_name());
        }
 }