From b62197c283bb6fe653df153bbd97a5123f494c44 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sat, 11 Dec 2021 13:57:29 -0800 Subject: [PATCH] CMake+GitLab CI: Reduce verbosity. For various commands, make sure we show warnings and errors, but not other extraneous information such as filenames. --- .gitlab-ci.yml | 4 ++-- CMakeLists.txt | 4 ++-- cmake/modules/FindAsciidoctor.cmake | 1 + cmake/modules/FindXSLTPROC.cmake | 2 +- packaging/nsis/CMakeLists.txt | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 101a6531a5..feddedd96d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -337,7 +337,7 @@ Win64 Package: - C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix - msbuild /verbosity:minimal portableapps_package.vcxproj - C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\portableapps - - $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable??_*.paf.exe + - $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /q /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable??_*.paf.exe - msbuild /verbosity:minimal pdb_zip_package.vcxproj - C:\gitlab-builds\bin\mse-scan.ps1 - $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi", "packaging\portableapps\WiresharkPortable??_*.paf.exe", "Wireshark-pdb-win??-*.zip" @@ -385,7 +385,7 @@ Win32 Package: - C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix - msbuild /verbosity:minimal portableapps_package.vcxproj - C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\portableapps - - $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable??_*.paf.exe + - $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /q /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable??_*.paf.exe - msbuild /verbosity:minimal pdb_zip_package.vcxproj - C:\gitlab-builds\bin\mse-scan.ps1 - $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi", "packaging\portableapps\WiresharkPortable??_*.paf.exe", "Wireshark-pdb-win??-*.zip" diff --git a/CMakeLists.txt b/CMakeLists.txt index 695081ceef..868b2850f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2231,7 +2231,7 @@ if(USE_REPOSITORY) add_custom_command(TARGET pdb_zip_package POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove -f "${_pdb_zip}" COMMAND ${ZIP_EXECUTABLE} a -tzip -mmt=on "${_pdb_zip_win}" - -bb2 + -bb0 -bd -r *.pdb *.lib WORKING_DIRECTORY "${_dll_output_dir}" ) @@ -2617,7 +2617,7 @@ if(BUILD_wireshark AND QT_FOUND) COMMAND set "PATH=${QT_BIN_PATH};%PATH%" COMMAND "${QT_WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime - --verbose 10 + --verbose 0 $<$:--pdb> "$" ) diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index 2f485e5547..f905aa26e0 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -41,6 +41,7 @@ if(ASCIIDOCTOR_EXECUTABLE) # Doesn't work with AsciidoctorJ? # --failure-level=WARN # --trace + --quiet --attribute build_dir=${CMAKE_CURRENT_BINARY_DIR} --require ${CMAKE_SOURCE_DIR}/docbook/asciidoctor-macros/ws_utils.rb --require ${CMAKE_SOURCE_DIR}/docbook/asciidoctor-macros/commaize-block.rb diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index f23082d646..b4f0ac857d 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -90,7 +90,7 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) IF(${_mode} STREQUAL "chunked") SET(_basedir ${_dir_pfx}_html_chunked) SET(_stylesheet "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") - SET(_modeparams --stringparam chunker.output.encoding UTF-8) + SET(_modeparams --stringparam chunker.output.encoding UTF-8 --stringparam chunk.quietly 1) ELSE() # single-page SET(_basedir ${_dir_pfx}_html) SET(_stylesheet custom_layer_single_html.xsl) diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 5c112329b9..07477800bf 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -170,7 +170,7 @@ set(NSIS_OPTIONS /DSTAGING_DIR=${_staging_dir} /DOUTFILE_DIR=${_outfile_dir} /DNSIS_INCLUDE_DIR=${_nsis_include_dir} - /V4 + /V2 PARENT_SCOPE )