diff options
| author | Andre Heinecke <aheinecke@gnupg.org> | 2020-11-04 13:41:07 +0100 |
|---|---|---|
| committer | Andre Heinecke <aheinecke@gnupg.org> | 2020-11-04 13:50:13 +0100 |
| commit | e2659f4bf603693c43af0444239bc52744291edc (patch) | |
| tree | 3491454bf35b9940955338228a21783a34d23e0c | |
| parent | e8aae18b997b3fdbfac86c644be94044aa67224d (diff) | |
| download | gnupg-e2659f4bf603693c43af0444239bc52744291edc.tar.gz | |
w32: Add windows subsystem variant of gpgconf
* tools/Makefile.am (gpgconf-w32): New target. Builds gpgconf with
subsystem windows.
* build-aux/speedo/w32/wixlib.wxs: Package it.
--
This allows us to create scripts that call gpgconf without opening
a console. Using subsystem windows is better then to just close
the console after start as it avoids the console flashing up.
(cherry picked from commit c366e04958481382c3f7b50f169120053186069b)
| -rw-r--r-- | build-aux/speedo/w32/wixlib.wxs | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs index a92fbf6c1..733ae552c 100644 --- a/build-aux/speedo/w32/wixlib.wxs +++ b/build-aux/speedo/w32/wixlib.wxs @@ -73,6 +73,9 @@ and then manually edited: <Component Id="cmpAF601EA2DF4EFD403CBF65A0D5162912" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="28A7D50E-4BC0-4A38-8420-52C5D1EB3F55"> <File Id="fil00B1F6AD370147577D6F7C998ACE6121" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgconf.exe"/> </Component> + <Component Id="cmpAF601EA2DF4EFD403CBF65A0D5162922" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="EEF227D9-1FA3-4A96-AF86-12D1FDC12925"> + <File Id="fil00B1F6AD370147577D6F7C998ACE6122" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgconf-w32.exe"/> + </Component> <Component Id="cmp3BA8A06E4085F542FDAA78BAFB507AD4" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="E026569F-F37A-49FC-A529-68BDE3097218"> <File Id="fil1A596ECA8DC19F8EC626168033269CFE" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpgme-w32spawn.exe"/> </Component> diff --git a/tools/Makefile.am b/tools/Makefile.am index 27a416be3..81e8b43b2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -54,6 +54,8 @@ libexec_PROGRAMS = gpg-wks-client bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun} if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit +else +bin_PROGRAMS += gpgconf-w32 endif libexec_PROGRAMS += gpg-check-pattern @@ -106,6 +108,10 @@ gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \ $(LIBICONV) $(W32SOCKLIBS) gpgconf_LDFLAGS = $(extra_bin_ldflags) +gpgconf_w32_SOURCES = $(gpgconf_SOURCES) +gpgconf_w32_LDADD = $(gpgconf_LDADD) +gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows + gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h gpgparsemail_LDADD = |