Make Library.qbs configurable

Move all tag installation code to the Library.qbs to make it possible to
switch between dynamic/static libraries in user code.

Also, add test for the LoadableModule item.

Change-Id: I947977e5974f9c37d27be6ccd7ad3d117a05af18
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 39 insertions, 29 deletions

diff --git a/share/qbs/imports/qbs/base/DynamicLibrary.qbs b/share/qbs/imports/qbs/base/DynamicLibrary.qbs
index 267519a42..818665e38 100644
--- a/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+++ b/share/qbs/imports/qbs/base/DynamicLibrary.qbs
@@ -30,24 +30,4 @@
 
 Library {
     type: ["dynamiclibrary"].concat(isForAndroid ? ["android.nativelibrary"] : [])
-
-    installDir: isBundle ? "Library/Frameworks" : qbs.targetOS.contains("windows")
-                           ? "bin" : "lib"
-    property bool installImportLib: false
-    property string importLibInstallDir: "lib"
-
-    Group {
-        condition: install
-        fileTagsFilter: isBundle ? "bundle.content" : ["dynamiclibrary", "dynamiclibrary_symlink"]
-        qbs.install: true
-        qbs.installDir: installDir
-        qbs.installSourceBase: isBundle ? destinationDirectory : outer
-    }
-
-    Group {
-        condition: installImportLib
-        fileTagsFilter: "dynamiclibrary_import"
-        qbs.install: true
-        qbs.installDir: importLibInstallDir
-    }
 }
diff --git a/share/qbs/imports/qbs/base/Library.qbs b/share/qbs/imports/qbs/base/Library.qbs
index 615c2319f..2a5183606 100644
--- a/share/qbs/imports/qbs/base/Library.qbs
+++ b/share/qbs/imports/qbs/base/Library.qbs
@@ -34,4 +34,43 @@ NativeBinary {
             return ["staticlibrary"];
         return ["dynamiclibrary"].concat(isForAndroid ? ["android.nativelibrary"] : []);
     }
+
+    readonly property bool isDynamicLibrary: type.contains("dynamiclibrary")
+    readonly property bool isStaticLibrary: type.contains("staticlibrary")
+    readonly property bool isLoadableModule: type.contains("loadablemodule")
+
+    installDir: {
+        if (isBundle)
+            return "Library/Frameworks";
+        if (isDynamicLibrary)
+            return qbs.targetOS.contains("windows") ? "bin" : "lib";
+        if (isStaticLibrary)
+            return "lib";
+    }
+
+    property bool installImportLib: false
+    property string importLibInstallDir: "lib"
+
+    Group {
+        condition: install
+        fileTagsFilter: {
+            if (isBundle)
+                return ["bundle.content"];
+            if (isDynamicLibrary)
+                return ["dynamiclibrary", "dynamiclibrary_symlink"];
+            if (isStaticLibrary)
+                return ["staticlibrary"];
+            return [];
+        }
+        qbs.install: true
+        qbs.installDir: installDir
+        qbs.installSourceBase: isBundle ? destinationDirectory : outer
+    }
+
+    Group {
+        condition: installImportLib && type.contains("dynamiclibrary")
+        fileTagsFilter: "dynamiclibrary_import"
+        qbs.install: true
+        qbs.installDir: importLibInstallDir
+    }
 }
diff --git a/share/qbs/imports/qbs/base/StaticLibrary.qbs b/share/qbs/imports/qbs/base/StaticLibrary.qbs
index 4eea3c991..5a78a83b0 100644
--- a/share/qbs/imports/qbs/base/StaticLibrary.qbs
+++ b/share/qbs/imports/qbs/base/StaticLibrary.qbs
@@ -30,13 +30,4 @@
 
 Library {
     type: ["staticlibrary"]
-
-    installDir: isBundle ? "Library/Frameworks" : "lib"
-    Group {
-        condition: install
-        fileTagsFilter: isBundle ? "bundle.content" : "staticlibrary";
-        qbs.install: true
-        qbs.installDir: installDir
-        qbs.installSourceBase: isBundle ? destinationDirectory : outer
-    }
 }