diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-03-16 15:08:49 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-03-19 19:16:15 +0000 |
commit | 025eeaa0050fe29e63e4bb715fda7a9a03b291da (patch) | |
tree | c0a78b068c59e284f2b4a18e3cd69d776bb5ba24 | |
parent | e0ada9c8aeef0a1adc2328c622c1a7aba6a93aff (diff) |
bare-metal: Improve filtering for KEIL compiler output
Added some additional allowed output patterns (for MCS51
architecture).
Change-Id: I68629566ea11c53fd5d4c10ae6e1c4e668a70694
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | share/qbs/modules/cpp/keil.js | 11 |
1 files 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]; } |