diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | CMakeOptions.txt | 7 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-config.nsh.in | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51b441d7d1..a8cb0f1633 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -421,7 +421,7 @@ Windows x64 Package: - cd build script: - C:\Windows\py.exe ..\tools\make-version.py --set-release .. - - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off .. + - cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off -DENABLE_SIGNED_NSIS=On .. - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln - msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj - msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj diff --git a/CMakeOptions.txt b/CMakeOptions.txt index cd1394793c..664aeea957 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -151,11 +151,6 @@ if(WIN32) # Advanced options for developers to work-around limitations in the build # when cross-compiling to Windows. option(SKIP_NSIS_QT_DEPLOYMENT "Skip deploying Qt runtime with installer" OFF) - if(CMAKE_CROSSCOMPILING) - option(SKIP_NSIS_UNINSTALLER "Skip creating a Windows uninstaller" ON) - else() - option(SKIP_NSIS_UNINSTALLER "Skip creating a Windows uninstaller" OFF) - endif() mark_as_advanced(SKIP_NSIS_QT_DEPLOYMENT) - mark_as_advanced(SKIP_NSIS_UNINSTALLER) + option(ENABLE_SIGNED_NSIS "Enable the code signing step of the NSIS installer build" OFF) endif() diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 702ef53f8b..ace70b9520 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -35,3 +35,5 @@ #cmakedefine SMI_DIR "@SMI_DIR@" #cmakedefine QT_DIR "@QT_DIR@" + +#cmakedefine ENABLE_SIGNED_NSIS diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 9d6fe77f67..9e2d29b746 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1545,8 +1545,10 @@ NoFinalErrorMsg: SectionEnd ; Sign our installer and uninstaller during compilation. +!ifdef ENABLE_SIGNED_NSIS !finalize 'sign-wireshark.bat "%1"' = 0 ; %1 is replaced by the installer exe to be signed. !uninstfinalize 'sign-wireshark.bat "%1"' = 0 ; %1 is replaced by the uninstaller exe to be signed. +!endif ; ============================================================================ ; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD! |