DRY up some simple code in GenericGCC.

Change-Id: Ib2e9cb84421dcc518822c0cffc5f05b50d603580
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

2 files changed, 24 insertions, 53 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index ca9c015c3..1424e5297 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -186,23 +186,7 @@ CppModule {
                     artifacts.push(symlink);
                 }
             }
-            if (ModUtils.moduleProperty(product, "separateDebugInformation")) {
-                artifacts.push({
-                    filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoFilePath(product)),
-                    fileTags: ["debuginfo"]
-                });
-                if (PathTools.debugInfoIsBundle(product)) {
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoBundlePath(product)),
-                        fileTags: ["debuginfo_bundle"]
-                    });
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoPlistFilePath(product)),
-                        fileTags: ["debuginfo_plist"]
-                    });
-                }
-            }
-            return artifacts;
+            return artifacts.concat(Gcc.debugInfoArtifacts(product));
         }
 
         prepare: {
@@ -271,24 +255,7 @@ CppModule {
                                              PathTools.loadableModuleFilePath(product)),
                 fileTags: ["loadablemodule"]
             }
-            var artifacts = [app];
-            if (ModUtils.moduleProperty(product, "separateDebugInformation")) {
-                artifacts.push({
-                    filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoFilePath(product)),
-                    fileTags: ["debuginfo"]
-                });
-                if (PathTools.debugInfoIsBundle(product)) {
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoBundlePath(product)),
-                        fileTags: ["debuginfo_bundle"]
-                    });
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoPlistFilePath(product)),
-                        fileTags: ["debuginfo_plist"]
-                    });
-                }
-            }
-            return artifacts;
+            return [app].concat(Gcc.debugInfoArtifacts(product));
         }
 
         prepare: {
@@ -316,24 +283,7 @@ CppModule {
                                              PathTools.applicationFilePath(product)),
                 fileTags: ["application"]
             }
-            var artifacts = [app];
-            if (ModUtils.moduleProperty(product, "separateDebugInformation")) {
-                artifacts.push({
-                    filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoFilePath(product)),
-                    fileTags: ["debuginfo"]
-                });
-                if (PathTools.debugInfoIsBundle(product)) {
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoBundlePath(product)),
-                        fileTags: ["debuginfo_bundle"]
-                    });
-                    artifacts.push({
-                        filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoPlistFilePath(product)),
-                        fileTags: ["debuginfo_plist"]
-                    });
-                }
-            }
-            return artifacts;
+            return [app].concat(Gcc.debugInfoArtifacts(product));
         }
 
         prepare: {
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 62e8552f8..8c1a3160f 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -856,3 +856,24 @@ function concatLibsFromArtifacts(libs, artifacts)
     deps.reverse();
     return concatLibs(deps, libs);
 }
+
+function debugInfoArtifacts(product) {
+    var artifacts = [];
+    if (product.moduleProperty("cpp", "separateDebugInformation")) {
+        artifacts.push({
+            filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoFilePath(product)),
+            fileTags: ["debuginfo"]
+        });
+        if (PathTools.debugInfoIsBundle(product)) {
+            artifacts.push({
+                filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoBundlePath(product)),
+                fileTags: ["debuginfo_bundle"]
+            });
+            artifacts.push({
+                filePath: FileInfo.joinPaths(product.destinationDirectory, PathTools.debugInfoPlistFilePath(product)),
+                fileTags: ["debuginfo_plist"]
+            });
+        }
+    }
+    return artifacts;
+}