mirror of git://git.gnupg.org/gnupg.git
gpgconf,w32: Add manifest so we get the correct windows version.
* common/w32info-rc.h.in: Update copyright info. * tools/gpg-connect-agent-w32info.rc: Tweak file info. * tools/gpgconf-w32info.rc: New. * tools/gpgconf.w32-manifest.in: New. * configure.ac: Add new .in file. * tools/Makefile.am (EXTRA_DIST): Add them. (gpg_connect_agent_robjs, gpgconf_robjs): New. (gpgconf_LDADD): Add resource file. (gpg_connect_agent_LDADD): Change name of resource macro. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch
parent
a298ba02ee
commit
239e60a37f
|
|
@ -17,7 +17,7 @@ you can redistribute it and/or modify it under the terms of the \
|
|||
GNU General Public License as published by the Free Software Foundation; \
|
||||
either version 3 of the License, or (at your option) any later version.\0"
|
||||
|
||||
#define W32INFO_COMPANYNAME "The GnuPG Project\0"
|
||||
#define W32INFO_COMPANYNAME "g10 Code GmbH\0"
|
||||
|
||||
#define W32INFO_VI_FILEVERSION @BUILD_FILEVERSION@
|
||||
#define W32INFO_VI_PRODUCTVERSION @BUILD_FILEVERSION@
|
||||
|
|
@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0"
|
|||
#define W32INFO_PRODUCTVERSION "@VERSION@\0"
|
||||
|
||||
#define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \
|
||||
2019 Free Software Foundation, Inc.\0"
|
||||
2020 g10 Code GmbH\0"
|
||||
|
|
|
|||
|
|
@ -2009,6 +2009,7 @@ tests/gpgsm/Makefile
|
|||
tests/gpgme/Makefile
|
||||
tests/pkits/Makefile
|
||||
g10/gpg.w32-manifest
|
||||
tools/gpgconf.w32-manifest
|
||||
])
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,20 @@ EXTRA_DIST = \
|
|||
Manifest watchgnupg.c no-libgcrypt.c \
|
||||
addgnupghome applygnupgdefaults \
|
||||
lspgpot mail-signed-keys convert-from-106 sockprox.c \
|
||||
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
|
||||
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc \
|
||||
gpgconf-w32info.rc gpgconf.w32-manifest
|
||||
|
||||
|
||||
AM_CPPFLAGS =
|
||||
include $(top_srcdir)/am/cmacros.am
|
||||
|
||||
if HAVE_W32_SYSTEM
|
||||
resource_objs += gpg-connect-agent-w32info.o
|
||||
gpg_connect_agent_robjs = $(resource_objs) gpg-connect-agent-w32info.o
|
||||
gpgconf_robjs = $(resource_objs) gpgconf-w32info.o
|
||||
gpgconf-w32info.o: gpgconf.w32-manifest
|
||||
else
|
||||
gpg_connect_agent_robjs =
|
||||
gpgconf_robjs =
|
||||
endif
|
||||
|
||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
||||
|
|
@ -105,7 +111,8 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c
|
|||
# do not eliminate the supposed-to-be-unused-inline-functions).
|
||||
gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
|
||||
$(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
||||
$(LIBICONV) $(W32SOCKLIBS)
|
||||
$(LIBICONV) $(W32SOCKLIBS) \
|
||||
$(gpgconf_robjs)
|
||||
gpgconf_LDFLAGS = $(extra_bin_ldflags)
|
||||
|
||||
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
|
||||
|
|
@ -124,8 +131,7 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
|
|||
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
|
||||
$(GPG_ERROR_LIBS) \
|
||||
$(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
|
||||
$(resource_objs)
|
||||
|
||||
$(gpg_connect_agent_robjs)
|
||||
|
||||
gpg_check_pattern_SOURCES = gpg-check-pattern.c
|
||||
gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* scdaemon-w32info.rc -*- c -*-
|
||||
/* gpgconnect-agent-w32info.rc -*- c -*-
|
||||
* Copyright (C) 2013 g10 Code GmbH
|
||||
*
|
||||
* This file is free software; as a special exception the author gives
|
||||
|
|
@ -32,8 +32,7 @@
|
|||
BEGIN
|
||||
BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
|
||||
BEGIN
|
||||
VALUE "FileDescription", L"GnuPG\x2019s command line access \
|
||||
to the agent\0"
|
||||
VALUE "FileDescription", L"GnuPG\x2019s IPC tool\0"
|
||||
VALUE "InternalName", "gpg-connect-agent\0"
|
||||
VALUE "OriginalFilename", "gpg-connect-agent.exe\0"
|
||||
VALUE "ProductName", W32INFO_PRODUCTNAME
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
/* gpgconf-w32info.rc -*- c -*-
|
||||
* Copyright (C) 2020 g10 Code GmbH
|
||||
*
|
||||
* This file is free software; as a special exception the author gives
|
||||
* unlimited permission to copy and/or distribute it, with or without
|
||||
* modifications, as long as this notice is preserved.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#include "afxres.h"
|
||||
#include "../common/w32info-rc.h"
|
||||
|
||||
1 ICON "../common/gnupg.ico"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION W32INFO_VI_FILEVERSION
|
||||
PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
|
||||
#else
|
||||
FILEFLAGS 0x00L
|
||||
#endif
|
||||
FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
|
||||
FILETYPE 0x1L /* VFT_APP (0x1) */
|
||||
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
|
||||
BEGIN
|
||||
VALUE "FileDescription", L"GnuPG\x2019s config tool\0"
|
||||
VALUE "InternalName", "gpgconf\0"
|
||||
VALUE "OriginalFilename", "gpgconf.exe\0"
|
||||
VALUE "ProductName", W32INFO_PRODUCTNAME
|
||||
VALUE "ProductVersion", W32INFO_PRODUCTVERSION
|
||||
VALUE "CompanyName", W32INFO_COMPANYNAME
|
||||
VALUE "FileVersion", W32INFO_FILEVERSION
|
||||
VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
|
||||
VALUE "Comments", W32INFO_COMMENTS
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 0x4b0
|
||||
END
|
||||
END
|
||||
|
||||
1 RT_MANIFEST "gpgconf.w32-manifest"
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<description>GNU Privacy Guard (Config tool)</description>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="GnuPG.gpgconf"
|
||||
version="@BUILD_VERSION@"
|
||||
/>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
|
||||
</application>
|
||||
</compatibility>
|
||||
</assembly>
|
||||
Loading…
Reference in New Issue