X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=0673a05e09b61b76ba9befbfe61a52bfe635af3c;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=9f983ef1d666fc7a690ed17da7a7cdb135e7ccaf;hpb=2606b03da59dc10e3826b833a2fceb0831d79972;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 9f983ef..0673a05 100644
--- 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"
 
@@ -16,45 +17,53 @@ 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()),
-	soname(create_soname(c))
+	import_lib(0)
 {
-	install_location = "lib";
-	if(component->get_type()==Component::MODULE)
+	if(builder.get_current_arch().get_system()=="windows")
+		install_location = "bin";
+	else
+		install_location = "lib";
+
+	const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(*component);
+	if(bcomp.get_type()==BinaryComponent::MODULE)
+		install_location /= package->get_name();
+	else
 	{
-		install_location += '/';
-		install_location += package->get_name();
+		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(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());
 	}
 }
 
-string SharedLibrary::create_soname(const Component &c)
+void SharedLibrary::set_import_library(ImportLibrary *imp)
 {
-	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));
+	import_lib = imp;
 }