diff options
| author | Moss Heim <[email protected]> | 2025-06-30 15:28:53 +0200 |
|---|---|---|
| committer | Moss Heim <[email protected]> | 2025-06-30 17:31:15 +0200 |
| commit | 2539f88791e6615ef35df70e78316ca9b14a67e5 (patch) | |
| tree | f95cefa2cc066c919108c3d87877753d54dac9fe | |
| parent | c002d37dfdaf6e097bb556e573ada2f407b93fda (diff) | |
Currently we silence any output from sbom.py unless it fails. But we
should at least echo the warnings/errors since they may be unique to the
platform/configuration and difficult to find otherwise.
* Add support for the environment variable
QT_WEBENGINE_VERBOSE_SBOM_OUTPUT to control more
info during SBOM gen.
* When sbom.py produces output, provide that output to the user.
Pick-to: 6.10
Change-Id: I3b0eda96ae63ab17ac35d9b67af9344a2e320215
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
| -rw-r--r-- | cmake/QtGnSbom.cmake | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cmake/QtGnSbom.cmake b/cmake/QtGnSbom.cmake index 905efed13..eb5187df8 100644 --- a/cmake/QtGnSbom.cmake +++ b/cmake/QtGnSbom.cmake @@ -31,6 +31,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT MODULE REQUIRED) +if(DEFINED ENV{QT_WEBENGINE_VERBOSE_SBOM_OUTPUT}) + set(SCRIPT_VERBOSE "--verbose") +else() + set(SCRIPT_VERBOSE "") +endif() + execute_process( COMMAND "${Python3_EXECUTABLE}" "${SCRIPT_PATH}" --gn-binary "${Gn_EXECUTABLE}" @@ -39,6 +45,7 @@ execute_process( --gn-version ${Gn_VERSION} --package-id ${PACKAGE_ID} --namespace "${DOC_NAMESPACE}" + ${SCRIPT_VERBOSE} "${OUTPUT}" RESULT_VARIABLE gn_result OUTPUT_VARIABLE gn_output @@ -46,8 +53,12 @@ execute_process( TIMEOUT 600 ) +string(REGEX REPLACE "\n$" "" gn_output "${gn_output}") +string(REGEX REPLACE "\n$" "" gn_error "${gn_error}") if(NOT gn_result EQUAL 0) - string(REGEX REPLACE "\n$" "" gn_output "${gn_output}") - string(REGEX REPLACE "\n$" "" gn_error "${gn_error}") message(FATAL_ERROR "\n-- SBOM generation FAILED\n${gn_output}\n${gn_error}\n-- Exit code: ${gn_result}\n") +elseif(DEFINED ENV{QT_WEBENGINE_VERBOSE_SBOM_OUTPUT}) + message(STATUS "SBOM generation successful\n-- stdout: ${gn_output}\n-- stderr: ${gn_error}") +elseif(NOT (gn_output STREQUAL "" AND gn_error STREQUAL "")) + message(STATUS "SBOM generation successful but did not run cleanly:\n-- stdout: ${gn_output}\n-- stderr: ${gn_error}") endif() |