qbs build: Don't use directories as input artifacts.

This is not officially supported and is no longer necessary with
qbs.installSourceBase.

Change-Id: I7eb0567192a608f583daaa49dee5e5d361770101
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/share/share.qbs b/share/share.qbs
index a75a4cd58..d78dd9a98 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -1,28 +1,38 @@
 import qbs
 import qbs.File
+import qbs.FileInfo
 
 Product {
     name: "qbs resources"
+    type: ["copied qbs resources"]
     Group {
-        files: ["qbs"]
+        name: "Modules and imports"
+        files: ["qbs/**/*"]
+        fileTags: ["qbs resources"]
         qbs.install: true
         qbs.installDir: project.resourcesInstallDir + "/share"
+        qbs.installSourceBase: "."
     }
 
     Group {
-        files: "../examples"
+        name: "Examples as resources"
+        files: ["../examples/**/*"]
+        fileTags: []
         qbs.install: true
         qbs.installDir: project.resourcesInstallDir + "/share/qbs"
+        qbs.installSourceBase: ".."
     }
 
-    Transformer {
-        inputs: "qbs"
+    Rule {
+        inputs: ["qbs resources"]
         Artifact {
-            filePath: project.buildDirectory + '/' + project.resourcesInstallDir + "/share/qbs"
+            filePath: FileInfo.joinPaths(project.buildDirectory, project.resourcesInstallDir,
+                    "share", FileInfo.relativePath(product.sourceDirectory, input.filePath))
+            fileTags: ["copied qbs resources"]
         }
         prepare: {
             var cmd = new JavaScriptCommand();
-            cmd.description = "Copying share/qbs to build directory.";
+            cmd.description = "Copying resource " + input.fileName + " to build directory.";
             cmd.highlight = "codegen";
             cmd.sourceCode = function() { File.copy(input.filePath, output.filePath); }
             return cmd;