From 025eeaa0050fe29e63e4bb715fda7a9a03b291da Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sat, 16 Mar 2019 15:08:49 +0300 Subject: bare-metal: Improve filtering for KEIL compiler output Added some additional allowed output patterns (for MCS51 architecture). Change-Id: I68629566ea11c53fd5d4c10ae6e1c4e668a70694 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/keil.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/share/qbs/modules/cpp/keil.js b/share/qbs/modules/cpp/keil.js index 2228f1c5f..314d84c69 100644 --- a/share/qbs/modules/cpp/keil.js +++ b/share/qbs/modules/cpp/keil.js @@ -205,14 +205,18 @@ function collectLibraryDependencies(product) { function filterStdOutput(cmd) { cmd.stdoutFilterFunction = function(output) { - // Allow only the error and warning messages - // with its sub-content. var sourceLines = output.split("\n"); var filteredLines = []; for (var i in sourceLines) { if (sourceLines[i].startsWith("***") || sourceLines[i].startsWith(">>") - || sourceLines[i].startsWith(" ")) { + || sourceLines[i].startsWith(" ") + || sourceLines[i].startsWith("Program Size:") + || sourceLines[i].startsWith("A51 FATAL") + || sourceLines[i].startsWith("C51 FATAL") + || sourceLines[i].startsWith("ASSEMBLER INVOKED BY") + || sourceLines[i].startsWith("LOC OBJ LINE SOURCE") + ) { filteredLines.push(sourceLines[i]); } } @@ -548,5 +552,6 @@ function prepareArchiver(project, product, inputs, outputs, input, output) { var cmd = new Command(archiverPath, args) cmd.description = "linking " + output.fileName; cmd.highlight = "linker"; + filterStdOutput(cmd); return [cmd]; } -- cgit v1.2.3