X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=5e479f3c9f652f64c03a9ab3eb472ae645c807ed;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hp=c4f42e574ed7a484150966c063d9513d6bb72437;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index c4f42e5..5e479f3 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,41 +1,70 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
-#include "component.h"
+#include "binarycomponent.h"
+#include "builder.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
+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);
+}
+
 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()),
+	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(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		(*i)->set_used_in_shared_library(true);
 }
 
-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;
-		}
+	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.create_filename<SharedLibrary>(comp.get_name());
+	}
+}
 
-	return format("%s.%s", FS::basename(path), ver.substr(0, i));
+void SharedLibrary::set_import_library(ImportLibrary *imp)
+{
+	import_lib = imp;
 }