forked from osmocom/wireshark
CMake+GitLab CI: Reduce verbosity.
For various commands, make sure we show warnings and errors, but not other extraneous information such as filenames.
This commit is contained in:
parent
773420bad9
commit
b62197c283
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
$<$<BOOL:${MSVC}>:--pdb>
|
||||
"$<TARGET_FILE:wireshark>"
|
||||
)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue