From 88e24341e57c96e31a25e92e09d67989e64cc1c1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 25 Apr 2013 12:00:16 +0100 Subject: [PATCH] w32: Add icons and version information. * common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico. * agent/gpg-agent-w32info.rc: New. * g10/gpg-w32info.rc: New. * scd/scdaemon-w32info.rc: New. * sm/gpgsm-w32info.rc: New. * tools/gpg-connect-agent-w32info.rc: New. * common/w32info-rc.h.in: New. * configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP) (BUILD_HOSTNAME): New. (AC_CONFIG_FILES): Add w32info-rc.h. * am/cmacros.am (.rc.o): New rule. * agent/Makefile.am, common/Makefile.am, g10/Makefile.am * scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to build resource files. -- Signed-off-by: Werner Koch (cherry picked from commit 049b3d9ca0285d15c00c215ac9b533c994196ca4) Solved conflicts in: agent/Makefile.am common/Makefile.am g10/Makefile.am scd/Makefile.am sm/Makefile.am tools/Makefile.am --- agent/Makefile.am | 24 ++++++-------- agent/gpg-agent-w32info.rc | 50 ++++++++++++++++++++++++++++ am/cmacros.am | 6 ++++ common/Makefile.am | 3 +- common/gnupg.ico | Bin 0 -> 10134 bytes common/w32info-rc.h.in | 32 ++++++++++++++++++ configure.ac | 23 +++++++++++++ g10/Makefile.am | 9 +++-- g10/gpg-w32info.rc | 50 ++++++++++++++++++++++++++++ scd/Makefile.am | 8 +++-- scd/scdaemon-w32info.rc | 50 ++++++++++++++++++++++++++++ sm/Makefile.am | 7 ++-- sm/gpgsm-w32info.rc | 50 ++++++++++++++++++++++++++++ tools/Makefile.am | 9 +++-- tools/gpg-connect-agent-w32info.rc | 51 +++++++++++++++++++++++++++++ 15 files changed, 348 insertions(+), 24 deletions(-) create mode 100644 agent/gpg-agent-w32info.rc create mode 100644 common/gnupg.ico create mode 100644 common/w32info-rc.h.in create mode 100644 g10/gpg-w32info.rc create mode 100644 scd/scdaemon-w32info.rc create mode 100644 sm/gpgsm-w32info.rc create mode 100644 tools/gpg-connect-agent-w32info.rc diff --git a/agent/Makefile.am b/agent/Makefile.am index c9fa9c7e8..92f8fc031 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -25,13 +25,17 @@ libexec_PROGRAMS += gpg-preset-passphrase endif noinst_PROGRAMS = $(TESTS) -EXTRA_DIST = ChangeLog-2011 +EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl include $(top_srcdir)/am/cmacros.am +if HAVE_W32_SYSTEM +resource_objs += gpg-agent-w32info.o +endif + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) gpg_agent_SOURCES = \ @@ -59,25 +63,17 @@ else pwquery_libs = ../common/libsimple-pwquery.a endif -#if HAVE_W32_SYSTEM -#.rc.o: -# $(WINDRES) `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ -# sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i $< -o $@ -# -#gpg_agent_res_ldflags = -Wl,gpg-agent-resource.o -Wl,--subsystem,windows -#gpg_agent_res_deps = gpg-agent-resource.o -#else -gpg_agent_res_ldflags = -gpg_agent_res_deps = -#endif - gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) gpg_agent_LDADD = $(commonpth_libs) \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ + $(resource_objs) gpg_agent_LDFLAGS = $(extra_bin_ldflags) $(gpg_agent_res_ldflags) gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps) + $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ + $(resource_objs) gpg_protect_tool_SOURCES = \ protect-tool.c \ diff --git a/agent/gpg-agent-w32info.rc b/agent/gpg-agent-w32info.rc new file mode 100644 index 000000000..d586cad0c --- /dev/null +++ b/agent/gpg-agent-w32info.rc @@ -0,0 +1,50 @@ +/* gpg-agent-w32info.rc -*- c -*- + * Copyright (C) 2013 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 private key daemon\0" + VALUE "InternalName", "gpg-agent\0" + VALUE "OriginalFilename", "gpg-agent.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 diff --git a/am/cmacros.am b/am/cmacros.am index 51f47c373..6ee428357 100644 --- a/am/cmacros.am +++ b/am/cmacros.am @@ -65,6 +65,12 @@ extra_sys_libs = extra_bin_ldflags = endif +if HAVE_W32_SYSTEM +.rc.o: + $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@" + +endif +resource_objs = # Convenience macros libcommon = ../common/libcommon.a diff --git a/common/Makefile.am b/common/Makefile.am index ff8fee320..554918b04 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -19,7 +19,8 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \ - audit-events.h status-codes.h README.jnlib ChangeLog.jnlib + audit-events.h status-codes.h README.jnlib ChangeLog.jnlib \ + w32info-rc.h.in gnupg.ico noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a if !HAVE_W32CE_SYSTEM diff --git a/common/gnupg.ico b/common/gnupg.ico new file mode 100644 index 0000000000000000000000000000000000000000..4c4bae0a9bed313af54eb34d8a87b8255ecc35ad GIT binary patch literal 10134 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 LrwW&Is#5<3=9S7l literal 0 HcmV?d00001 diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in new file mode 100644 index 000000000..1a427ee56 --- /dev/null +++ b/common/w32info-rc.h.in @@ -0,0 +1,32 @@ +/* w32info-rc.h.in - Common defs for VERSIONINFO resources. + * Copyright (C) 2013 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. + */ + +/* This file is processed by configure to create w32info-rc.h . */ + +#define W32INFO_COMMENTS "This program is free software; \ +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 "g10 Code GmbH\0" + +#define W32INFO_VI_FILEVERSION @BUILD_FILEVERSION@ +#define W32INFO_VI_PRODUCTVERSION @BUILD_FILEVERSION@ + +#define W32INFO_FILEVERSION "@VERSION@ (@BUILD_REVISION@) \ +built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0" + +#define W32INFO_PRODUCTNAME "GNU Privacy Guard (GnuPG)\0" +#define W32INFO_PRODUCTVERSION "@VERSION@\0" + +#define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \ +2013 Free Software Foundation, Inc.\0" diff --git a/configure.ac b/configure.ac index 353546a09..5335e56d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1570,6 +1570,28 @@ fi +# +# Provide information about the build. +# +BUILD_REVISION="mym4_revision" +AC_SUBST(BUILD_REVISION) +AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) + +changequote(,)dnl +BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` +changequote([,])dnl +BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec" +AC_SUBST(BUILD_FILEVERSION) + +BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` +AC_SUBST(BUILD_TIMESTAMP) +AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP", + [The time this package was configured for a build]) +BUILD_HOSTNAME="$ac_hostname" +AC_SUBST(BUILD_HOSTNAME) + + # # Print errors here so that they are visible all # together and the user can acquire them all together. @@ -1661,6 +1683,7 @@ po/Makefile.in gl/Makefile include/Makefile common/Makefile +common/w32info-rc.h kbx/Makefile g10/Makefile sm/Makefile diff --git a/g10/Makefile.am b/g10/Makefile.am index 899677cc3..abf41c30c 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -18,7 +18,7 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = options.skel ChangeLog-2011 +EXTRA_DIST = options.skel ChangeLog-2011 gpg-w32info.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ -I$(top_srcdir)/include -I$(top_srcdir)/intl @@ -42,6 +42,9 @@ else bzip2_source = endif +if HAVE_W32_SYSTEM +resource_objs += gpg-w32info.o +endif common_source = \ gpg.h \ @@ -128,11 +131,11 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(LIBINTL) $(CAPLIBS) $(NETLIBS) gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBICONV) $(extra_sys_libs) + $(LIBICONV) $(resource_objs) $(extra_sys_libs) gpg2_LDFLAGS = $(extra_bin_ldflags) gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBICONV) $(extra_sys_libs) + $(LIBICONV) $(resource_objs) $(extra_sys_libs) gpgv2_LDFLAGS = $(extra_bin_ldflags) t_common_ldadd = diff --git a/g10/gpg-w32info.rc b/g10/gpg-w32info.rc new file mode 100644 index 000000000..8caf221cc --- /dev/null +++ b/g10/gpg-w32info.rc @@ -0,0 +1,50 @@ +/* gpg-w32info.rc -*- c -*- + * Copyright (C) 2013 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 OpenPGP tool\0" + VALUE "InternalName", "gpg\0" + VALUE "OriginalFilename", "gpg.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 diff --git a/scd/Makefile.am b/scd/Makefile.am index 1af13d0aa..577b4a092 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = ChangeLog-2011 +EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc if HAVE_W32_SYSTEM libexec_PROGRAMS = scdaemon @@ -29,6 +29,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am +if HAVE_W32_SYSTEM +resource_objs += scdaemon-w32info.o +endif + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \ $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) @@ -48,7 +52,7 @@ scdaemon_SOURCES = \ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \ $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) + $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs) # Removed for now: We need to decide whether it makes sense to # continue it at all, given that gpg has now all required diff --git a/scd/scdaemon-w32info.rc b/scd/scdaemon-w32info.rc new file mode 100644 index 000000000..aa0eba4e5 --- /dev/null +++ b/scd/scdaemon-w32info.rc @@ -0,0 +1,50 @@ +/* scdaemon-w32info.rc -*- c -*- + * Copyright (C) 2013 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 smartcard daemon\0" + VALUE "InternalName", "scdaemon\0" + VALUE "OriginalFilename", "scdaemon.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 diff --git a/sm/Makefile.am b/sm/Makefile.am index e8dfe0571..7fff75284 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = ChangeLog-2011 +EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc bin_PROGRAMS = gpgsm @@ -26,6 +26,9 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl include $(top_srcdir)/am/cmacros.am +if HAVE_W32_SYSTEM +resource_objs += gpgsm-w32info.o +endif gpgsm_SOURCES = \ gpgsm.c gpgsm.h \ @@ -59,7 +62,7 @@ common_libs = ../kbx/libkeybox.a $(libcommon) ../gl/libgnu.a gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) \ - $(LIBICONV) $(extra_sys_libs) + $(LIBICONV) $(resource_objs) $(extra_sys_libs) gpgsm_LDFLAGS = $(extra_bin_ldflags) # Make sure that all libs are build before we use them. This is diff --git a/sm/gpgsm-w32info.rc b/sm/gpgsm-w32info.rc new file mode 100644 index 000000000..d813b0dc8 --- /dev/null +++ b/sm/gpgsm-w32info.rc @@ -0,0 +1,50 @@ +/* gpgsm-w32info.rc -*- c -*- + * Copyright (C) 2013 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 X.509/CMS tool\0" + VALUE "InternalName", "gpgsm\0" + VALUE "OriginalFilename", "gpgsm.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 diff --git a/tools/Makefile.am b/tools/Makefile.am index 9d842748a..bc48eeaff 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,12 +20,16 @@ EXTRA_DIST = \ Manifest watchgnupg.c \ addgnupghome applygnupgdefaults gpgsm-gencert.sh \ lspgpot mail-signed-keys convert-from-106 sockprox.c \ - ccidmon.c ChangeLog-2011 + ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am +if HAVE_W32_SYSTEM +resource_objs += gpg-connect-agent-w32info.o +endif + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) sbin_SCRIPTS = addgnupghome applygnupgdefaults @@ -113,7 +117,8 @@ gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c # FIXME: remove PTH_LIBS (why do we need them at all?) gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) + $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ + $(resource_objs) if !HAVE_W32CE_SYSTEM gpgkey2ssh_SOURCES = gpgkey2ssh.c diff --git a/tools/gpg-connect-agent-w32info.rc b/tools/gpg-connect-agent-w32info.rc new file mode 100644 index 000000000..4e7b19d35 --- /dev/null +++ b/tools/gpg-connect-agent-w32info.rc @@ -0,0 +1,51 @@ +/* scdaemon-w32info.rc -*- c -*- + * Copyright (C) 2013 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 command line access \ +to the agent\0" + VALUE "InternalName", "gpg-connect-agent\0" + VALUE "OriginalFilename", "gpg-connect-agent.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