Qbs: Added libDir option and use convenience install properties

Since Qbs 1.13, Application and DynamicLibrary items have convenient "install" and "installDir" properties. Added products.Tiled.libDir option, which can be used to change the directory libraries are installed to. This is useful for openSUSE packaging (and possibly Fedora), which like to put 64-bit libraries in a lib64 directory (see issue #3613).
mapeditor · Mar 16, 2023 · 8a7d07b · 8a7d07b
1 parent bca8635
commit 8a7d07b
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 91 deletions.
diff --git a/dist/distribute.qbs b/dist/distribute.qbs
@@ -105,7 +105,7 @@ Product {
             return list;
         }
         qbs.install: true
-        qbs.installDir: qbs.targetOS.contains("windows") ? "" : "lib"
+        qbs.installDir: qbs.targetOS.contains("windows") ? "" : project.libDir
     }
 
     property var pluginFiles: {

diff --git a/qbs/imports/TiledPlugin.qbs b/qbs/imports/TiledPlugin.qbs
@@ -1,3 +1,5 @@
+import qbs.FileInfo
+
 DynamicLibrary {
     Depends { name: "libtiled" }
     Depends { name: "cpp" }
@@ -32,17 +34,14 @@ DynamicLibrary {
         bundle.isBundle: false
     }
 
-    Group {
-        qbs.install: true
-        qbs.installDir: {
-            if (project.windowsLayout)
-                return "plugins/tiled"
-            else if (qbs.targetOS.contains("macos"))
-                return "Tiled.app/Contents/PlugIns"
-            else
-                return "lib/tiled/plugins"
-        }
-        fileTagsFilter: "dynamiclibrary"
+    install: true
+    installDir: {
+        if (project.windowsLayout)
+            return "plugins/tiled"
+        else if (qbs.targetOS.contains("macos"))
+            return "Tiled.app/Contents/PlugIns"
+        else
+            return FileInfo.joinPaths(project.libDir, "tiled/plugins")
     }
 
     FileTagger {

diff --git a/qbs/imports/TiledQtGuiApplication.qbs b/qbs/imports/TiledQtGuiApplication.qbs
@@ -4,7 +4,7 @@ QtGuiApplication {
         if (qbs.targetOS.contains("darwin"))
             return ["@loader_path/../Frameworks"];
         else
-            return ["$ORIGIN/../lib"];
+            return ["$ORIGIN/../" + project.libDir];
     }
     cpp.cxxLanguageVersion: "c++17"
     cpp.cxxFlags: {
@@ -24,23 +24,15 @@ QtGuiApplication {
         "QT_NO_URL_CAST_FROM_STRING",
     ]
 
-    Group {
-        qbs.install: true
-        qbs.installDir: {
-            if (project.windowsLayout) {
-                return "";
-            } else if (qbs.targetOS.contains("darwin")) {
-                // Non-bundle applications are installed into the main Tiled.app bundle
-                return bundle.isBundle ? "." : "Tiled.app/Contents/MacOS";
-            } else {
-                return "bin";
-            }
-        }
-        qbs.installSourceBase: product.buildDirectory
-        fileTagsFilter: {
-            if (qbs.targetOS.contains("darwin") && bundle.isBundle)
-                return ["bundle.content"];
-            return product.type;
+    install: true
+    installDir: {
+        if (project.windowsLayout) {
+            return "";
+        } else if (qbs.targetOS.contains("darwin")) {
+            // Non-bundle applications are installed into the main Tiled.app bundle
+            return isBundle ? "." : "Tiled.app/Contents/MacOS";
+        } else {
+            return "bin";
         }
     }
 }
diff --git a/qbs/imports/TiledTest.qbs b/qbs/imports/TiledTest.qbs
@@ -16,6 +16,6 @@ CppApplication {
         }
         return flags;
     }
-    cpp.rpaths: FileInfo.joinPaths(cpp.rpathOrigin, "../install-root/usr/local/lib/")
+    cpp.rpaths: FileInfo.joinPaths(cpp.rpathOrigin, "../install-root/usr/local", project.libDir)
     autotest.workingDir: sourceDirectory
 }
diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
@@ -198,18 +198,14 @@ DynamicLibrary {
         cpp.includePaths: "."
     }
 
-    Group {
-        condition: !qbs.targetOS.contains("darwin")
-        qbs.install: true
-        qbs.installDir: {
-            if (qbs.targetOS.contains("windows"))
-                if (project.windowsLayout)
-                    return ""
-                else
-                    return "bin"
+    install: !qbs.targetOS.contains("darwin")
+    installDir: {
+        if (qbs.targetOS.contains("windows"))
+            if (project.windowsLayout)
+                return ""
             else
-                return "lib"
-        }
-        fileTagsFilter: "dynamiclibrary"
+                return "bin"
+        else
+            return project.libDir
     }
 }
diff --git a/src/libtiledquick/libtiledquick.qbs b/src/libtiledquick/libtiledquick.qbs
@@ -62,18 +62,14 @@ DynamicLibrary {
         cpp.includePaths: "."
     }
 
-    Group {
-        condition: !qbs.targetOS.contains("darwin")
-        qbs.install: true
-        qbs.installDir: {
-            if (qbs.targetOS.contains("windows"))
-                if (project.windowsLayout)
-                    return ""
-                else
-                    return "bin"
+    install: !qbs.targetOS.contains("darwin")
+    installDir: {
+        if (qbs.targetOS.contains("windows"))
+            if (project.windowsLayout)
+                return ""
             else
-                return "lib"
-        }
-        fileTagsFilter: "dynamiclibrary"
+                return "bin"
+        else
+            return project.libDir
     }
 }
diff --git a/src/tiled/libtilededitor.qbs b/src/tiled/libtilededitor.qbs
@@ -597,18 +597,14 @@ DynamicLibrary {
         cpp.includePaths: "."
     }
 
-    Group {
-        condition: !qbs.targetOS.contains("darwin")
-        qbs.install: true
-        qbs.installDir: {
-            if (qbs.targetOS.contains("windows"))
-                if (project.windowsLayout)
-                    return ""
-                else
-                    return "bin"
+    install: !qbs.targetOS.contains("darwin")
+    installDir: {
+        if (qbs.targetOS.contains("windows"))
+            if (project.windowsLayout)
+                return ""
             else
-                return "lib"
-        }
-        fileTagsFilter: "dynamiclibrary"
+                return "bin"
+        else
+            return project.libDir
     }
 }
diff --git a/src/tiledquick/tiledquick.qbs b/src/tiledquick/tiledquick.qbs
@@ -19,7 +19,7 @@ QtGuiApplication {
     }
 
     cpp.includePaths: ["."]
-    cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../Frameworks"] : ["$ORIGIN/../lib"]
+    cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../Frameworks"] : ["$ORIGIN/../" + project.libDir]
     cpp.cxxLanguageVersion: "c++17"
     cpp.cxxFlags: {
         var flags = base;
@@ -42,24 +42,14 @@ QtGuiApplication {
         targetName: "Tiled Quick"
     }
 
-    Group {
-        condition: !qbs.targetOS.contains("darwin")
-        qbs.install: true
-        qbs.installDir: {
-            if (project.windowsLayout)
-                return ""
-            else
-                return "bin"
-        }
-        fileTagsFilter: product.type
-    }
-
-    // This is necessary to install the app bundle (OS X)
-    Group {
-        fileTagsFilter: ["bundle.content"]
-        qbs.install: true
-        qbs.installDir: "."
-        qbs.installSourceBase: product.buildDirectory
+    install: true
+    installDir: {
+        if (project.windowsLayout)
+            return ""
+        else if (qbs.targetOS.contains("darwin"))
+            return "."
+        else
+            return "bin"
     }
 
     // Include libtiled.dylib in the app bundle

diff --git a/src/tiledquickplugin/tiledquickplugin.qbs b/src/tiledquickplugin/tiledquickplugin.qbs
@@ -37,17 +37,18 @@ DynamicLibrary {
         "tiledquickplugin.h"
     ]
 
-    property string installBase: qbs.targetOS.contains("darwin") ? "Tiled Quick.app/Contents/" : ""
+    install: true
+    installDir: {
+        var installBase = qbs.targetOS.contains("darwin") ? "Tiled Quick.app/Contents/" : "";
+        return installBase + "qml/org/mapeditor/Tiled";
+    }
 
     Group {
         name: "qmldir"
         files: "qmldir"
         fileTags: "qmldir"
-    }
 
-    Group {
         qbs.install: true
-        qbs.installDir: installBase + "qml/org/mapeditor/Tiled"
-        fileTagsFilter: ["dynamiclibrary", "qmldir"]
+        qbs.installDir: installDir
     }
 }
diff --git a/tiled.qbs b/tiled.qbs
@@ -9,6 +9,7 @@ Project {
     property string version: Environment.getEnv("TILED_VERSION") || "1.10.0";
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
     property bool release: Environment.getEnv("TILED_RELEASE") == "true"
+    property string libDir: "lib"
     property bool installHeaders: false
     property bool useRPaths: true
     property bool windowsInstaller: false