1 files changed, 11 insertions, 53 deletions

diff --git a/share/qbs/modules/cpp/sdcc.qbs b/share/qbs/modules/cpp/sdcc.qbs
index a0d795b40..7b65ec609 100644
--- a/share/qbs/modules/cpp/sdcc.qbs
+++ b/share/qbs/modules/cpp/sdcc.qbs
@@ -32,9 +32,7 @@ import qbs 1.0
 import qbs.File
 import qbs.FileInfo
 import qbs.ModUtils
-import qbs.PathTools
 import qbs.Probes
-import qbs.Utilities
 import "sdcc.js" as SDCC
 
 CppModule {
@@ -117,13 +115,8 @@ CppModule {
     Rule {
         id: assembler
         inputs: ["asm"]
-
-        Artifact {
-            fileTags: ["obj"]
-            filePath: Utilities.getHash(input.baseDir) + "/"
-                      + input.fileName + input.cpp.objectSuffix
-        }
-
+        outputFileTags: ["obj", "asm_adb", "asm_lst", "asm_src", "asm_sym", "rst_data"]
+        outputArtifacts: SDCC.compilerOutputArtifacts(input)
         prepare: SDCC.prepareAssembler.apply(SDCC, arguments);
     }
 
@@ -143,14 +136,9 @@ CppModule {
         id: compiler
         inputs: ["cpp", "c"]
         auxiliaryInputs: ["hpp"]
-
-        Artifact {
-            fileTags: ["obj"]
-            filePath: Utilities.getHash(input.baseDir) + "/"
-                      + input.fileName + input.cpp.objectSuffix
-        }
-
-        prepare: SDCC.prepareCompiler.apply(SDCC, arguments);
+        outputFileTags: ["obj", "asm_adb", "asm_lst", "asm_src", "asm_sym", "rst_data"]
+        outputArtifacts: SDCC.compilerOutputArtifacts(input)
+        prepare: SDCC.prepareCompiler.apply(SDCC, arguments)
     }
 
     Rule {
@@ -158,33 +146,9 @@ CppModule {
         multiplex: true
         inputs: ["obj", "linkerscript"]
         inputsFromDependencies: ["staticlibrary"]
-
-        outputFileTags: {
-            var tags = ["application"];
-            if (product.moduleProperty("cpp", "generateMapFile"))
-                tags.push("map_file");
-            return tags;
-        }
-        outputArtifacts: {
-            var app = {
-                fileTags: ["application"],
-                filePath: FileInfo.joinPaths(
-                              product.destinationDirectory,
-                              PathTools.applicationFilePath(product))
-            };
-            var artifacts = [app];
-            if (product.cpp.generateMapFile) {
-                artifacts.push({
-                    fileTags: ["map_file"],
-                filePath: FileInfo.joinPaths(
-                              product.destinationDirectory,
-                              product.targetName + ".map")
-                });
-            }
-            return artifacts;
-        }
-
-        prepare:SDCC.prepareLinker.apply(SDCC, arguments);
+        outputFileTags: ["application", "lk_cmd", "mem_summary", "mem_map"]
+        outputArtifacts: SDCC.applicationLinkerOutputArtifacts(product)
+        prepare:SDCC.prepareLinker.apply(SDCC, arguments)
     }
 
     Rule {
@@ -192,14 +156,8 @@ CppModule {
         multiplex: true
         inputs: ["obj"]
         inputsFromDependencies: ["staticlibrary"]
-
-        Artifact {
-            fileTags: ["staticlibrary"]
-            filePath: FileInfo.joinPaths(
-                            product.destinationDirectory,
-                            PathTools.staticLibraryFilePath(product))
-        }
-
-        prepare: SDCC.prepareArchiver.apply(SDCC, arguments);
+        outputFileTags: ["staticlibrary"]
+        outputArtifacts: SDCC.staticLibraryLinkerOutputArtifacts(product)
+        prepare: SDCC.prepareArchiver.apply(SDCC, arguments)
     }
 }