From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 5 Sep 2012 17:08:12 +0000 (+0300)
Subject: Don't append library version to the end of the filename on Windows
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=68517b5732dd29d9fa35086f184b4bd3bc99b45b;p=builder.git

Don't append library version to the end of the filename on Windows
---

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 5fcbe74..b1ad358 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -32,7 +32,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 			if(version[i]=='.' && ++dots>=2)
 				break;
 
-		soname = format("%s.%s", FS::basename(path), version.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;
 	}
 }