X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=b1ad358fdbc675a3113333a6eaae5bcbcfd8f921;hb=68517b5732dd29d9fa35086f184b4bd3bc99b45b;hp=868e822159847deebf24a76ff23867442485c142;hpb=0458300fda4f345f865a7f3ee4fc0f2020a91983;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 868e822..b1ad358 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "builder.h"
 #include "component.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -13,28 +8,48 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-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))
-{ }
+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);
+}
 
-string SharedLibrary::create_soname(const Component &c)
+SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+	Binary(b, c, generate_filename(c), objs),
+	libname(c.get_name())
 {
-	const string &ver = c.get_package().get_version();
-	if(ver.empty())
-		return string();
+	install_location = "lib";
+	if(component->get_type()==Component::MODULE)
+		install_location /= package->get_name();
 
-	unsigned dots = 0;
-	unsigned i = 0;
-	for(; i<ver.size(); ++i)
-		if(ver[i]=='.')
-		{
-			++dots;
-			if(dots>=2)
+	const string &version = component->get_package().get_version();
+	if(!version.empty())
+	{
+		string::size_type i = 0;
+		for(unsigned dots=0; i<version.size(); ++i)
+			if(version[i]=='.' && ++dots>=2)
 				break;
-		}
 
-	return format("%s.%s", name, ver.substr(0, i));
+		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.substr(0, i)));
+		else
+			soname = format("%s.%s", pattern.apply(component->get_name()), version.substr(0, i));
+
+		install_filename = soname;
+	}
+}
+
+string SharedLibrary::generate_filename(const Component &comp)
+{
+	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());
+	}
 }