diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-09 14:47:10 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-12 08:11:46 +0000 |
commit | c6f0044d74fc6cbf6076d1f1c80b179a8067e387 (patch) | |
tree | 6a2cc1e73c74810a7d088a67dad87eefa5414628 /share | |
parent | b608f25a930710dc146e9e4ed99104be36de1024 (diff) |
Add product name to command descriptions
The pure file name that the description usually contains does not always
provide enough context: It's not necessarily clear from a file name
which product it belongs to, and some files can be built as part of more
than one product.
Because we print the full product name, including the multiplexing
information if necessary, we also remove the JS code that provided this
kind of disambiguation for GCC compiler and linker rules only.
[ChangeLog] Command descriptions now also contain the product name.
Change-Id: I9702a6cff3faffb086e5c93e02fffa6e65fb1043
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/cpp/gcc.js | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index e5614127d..ce6871c70 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -959,17 +959,6 @@ function prepareAssembler(project, product, inputs, outputs, input, output) { return cmd; } -function nativeConfigString(product) { - var props = []; - if ((product.multiplexed || product.aggregate) && product.multiplexConfigurationId) { - if (product.qbs.targetOS.containsAny(["android", "darwin"])) - props.push(product.qbs.architecture); - if (product.qbs.targetOS.contains("darwin")) - props.push(product.qbs.buildVariant); - } - return props.length > 0 ? (" (" + props.join(", ") + ")") : ""; -} - function compilerEnvVars(config, compilerInfo) { if (config.qbs.toolchain.contains("qcc")) @@ -1037,7 +1026,6 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli cmd.description = (pchOutput ? 'pre' : '') + 'compiling ' + input.fileName; if (pchOutput) cmd.description += ' (' + compilerInfo.tag + ')'; - cmd.description += nativeConfigString(product); cmd.highlight = "compiler"; cmd.relevantEnvironmentVariables = compilerEnvVars(input, compilerInfo); cmd.responseFileArgumentIndex = wrapperArgsLength; @@ -1256,7 +1244,7 @@ function prepareLinker(project, product, inputs, outputs, input, output) { } cmd = new Command(linkerPath, args); - cmd.description = 'linking ' + primaryOutput.fileName + nativeConfigString(product); + cmd.description = 'linking ' + primaryOutput.fileName; cmd.highlight = 'linker'; cmd.relevantEnvironmentVariables = linkerEnvVars(product, inputs); cmd.responseFileArgumentIndex = responseFileArgumentIndex; |