diff options
| author | Werner Koch <wk@gnupg.org> | 2021-10-12 17:12:29 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-10-12 17:12:39 +0200 |
| commit | 10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc (patch) | |
| tree | 8dc7f346aa2c6b86e4a874847e554c99a54320b1 /build-aux | |
| parent | tests: New way to make use of gpgconf.ctl in tests. (diff) | |
| download | gnupg2-10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc.tar.xz gnupg2-10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc.zip | |
speedo: Put the keyboxd into the Windows installer
* build-aux/speedo/w32/inst.nsi: Install keyboxd.
* Makefile.am (sign-release): Sign the wixlib only if generated.
* autogen.rc: Remove meanwhile obsolete option --with-regex.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index 6267b644a..bac898ccf 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -1,5 +1,5 @@ # inst.nsi - Installer for GnuPG on Windows. -*- coding: latin-1; -*- -# Copyright (C) 2005, 2014 g10 Code GmbH +# Copyright (C) 2005, 2014, 2019-2021 g10 Code GmbH # 2017 Intevation GmbH # # This file is part of GnuPG. @@ -43,7 +43,7 @@ !define PRETTY_PACKAGE "GNU Privacy Guard" !define PRETTY_PACKAGE_SHORT "GnuPG" !define COMPANY "The GnuPG Project" -!define COPYRIGHT "Copyright (C) 2017 The GnuPG Project" +!define COPYRIGHT "Copyright (C) 2021 g10 Code GmbH" !define DESCRIPTION "GnuPG: The GNU Privacy Guard for Windows" !define INSTALL_DIR "GnuPG" @@ -600,6 +600,7 @@ Section "-gnupginst" ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "keyboxd"' no_gpgconf: @@ -655,6 +656,14 @@ Section "GnuPG" SEC_gnupg File /oname=scdaemon.exe.tmp "libexec/scdaemon.exe" Rename /REBOOTOK scdaemon.exe.tmp scdaemon.exe + ClearErrors + SetOverwrite try + File "libexec/keyboxd.exe" + SetOverwrite lastused + ifErrors 0 +3 + File /oname=keyboxd.exe.tmp "libexec/keyboxd.exe" + Rename /REBOOTOK keyboxd.exe.tmp keyboxd.exe + SetOutPath "$INSTDIR\share\gnupg" File "share/gnupg/distsigkey.gpg" File "share/gnupg/sks-keyservers.netCA.pem" @@ -1059,6 +1068,7 @@ Section "-un.gnupglast" ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "keyboxd"' no_gpgconf: SectionEnd @@ -1316,6 +1326,7 @@ Section "-un.gnupg" Delete "$INSTDIR\bin\gpgsm.exe" Delete "$INSTDIR\bin\gpg-agent.exe" Delete "$INSTDIR\bin\scdaemon.exe" + Delete "$INSTDIR\bin\keyboxd.exe" Delete "$INSTDIR\bin\dirmngr.exe" Delete "$INSTDIR\bin\gpgconf.exe" Delete "$INSTDIR\bin\gpg-connect-agent.exe" |