Fix soname handling on OS X and iOS.

The correct soname (install name) is now generated for frameworks and
other bundle product types, and the prefix no longer requires
(but still permits) a trailing slash, which is the normal convention.

Change-Id: I2de33976352a99eeccc8fa94bf187c36c7968260
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/share/qbs/imports/qbs/UnixUtils/unix-utils.js b/share/qbs/imports/qbs/UnixUtils/unix-utils.js
index 261d1bb5b..9a085b0dc 100644
--- a/share/qbs/imports/qbs/UnixUtils/unix-utils.js
+++ b/share/qbs/imports/qbs/UnixUtils/unix-utils.js
@@ -1,4 +1,16 @@
+var BundleTools = loadExtension("qbs.BundleTools");
+var FileInfo = loadExtension("qbs.FileInfo");
+
 function soname(product, outputFileName) {
+    if (product.moduleProperty("qbs", "targetOS").contains("darwin")) {
+        if (BundleTools.isBundleProduct(product))
+            outputFileName = BundleTools.executablePath(product);
+        var prefix = product.moduleProperty("cpp", "installNamePrefix");
+        if (prefix)
+            outputFileName = FileInfo.joinPaths(prefix, outputFileName);
+        return outputFileName;
+    }
+
     function majorVersion(version, defaultValue) {
         var n = parseInt(version, 10);
         return isNaN(n) ? defaultValue : n;