Convert all list containers to vectors

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 6600b740332a23dff7a882a0a63e6c99afcbd8ec..4ef9bb6fdf09bfd76ab7820f6cbc4f58515e1d5b 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,7 +1,7 @@
 #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"
@@ -18,7 +18,7 @@ SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
                libname = libname.substr(3);
 }
 
-SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+SharedLibrary::SharedLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
        Binary(b, c, generate_filename(c), objs),
        libname(c.get_name()),
        import_lib(0)
@@ -28,7 +28,8 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
        else
                install_location = "lib";
 
-       if(component->get_type()==Component::MODULE)
+       const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(*component);
+       if(bcomp.get_type()==BinaryComponent::MODULE)
                install_location /= package->get_name();
        else
        {
@@ -36,35 +37,30 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
                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));
+                               soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, 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);
-                       }
+                               soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
                        else
-                               soname = format("%s.%s", pattern.apply(component->get_name()), version);
+                               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);
+       for(ObjectFile *o: objects)
+               o->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());
        }
 }