diff options
| author | Werner Koch <[email protected]> | 2015-02-03 18:11:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-02-04 08:15:34 +0000 |
| commit | 05428d12561bc7eb872a81444918dfe706477a41 (patch) | |
| tree | 81e57b392e28d14187f47a78c8b98af6a85d56c0 | |
| parent | Update copyright years. (diff) | |
| download | gnupg-05428d12561bc7eb872a81444918dfe706477a41.tar.gz gnupg-05428d12561bc7eb872a81444918dfe706477a41.zip | |
w32: Add manifest to gpg.
* g10/gpg.w32-manifest.in: New.
* g10/gpg-w32info.rc: Add manifest.
* g10/Makefile.am (EXTRA_DIST): Add manifest.
(gpg-w32info.o): Depend on manifest.
* configure.ac (BUILD_VERSION): New.
(AC_CONFIG_FILES): Add manifest.
--
There are no dependencies yet defined - we need to do this for the
libs first.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | g10/Makefile.am | 6 | ||||
| -rw-r--r-- | g10/gpg-w32info.rc | 2 | ||||
| -rw-r--r-- | g10/gpg.w32-manifest.in | 17 |
4 files changed, 29 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c61ecdcbd..ef045884f 100644 --- a/configure.ac +++ b/configure.ac @@ -1653,9 +1653,11 @@ 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'` +BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'` changequote([,])dnl -BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec" +BUILD_VERSION="${BUILD_VERSION}mym4_revision_dec" +BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,` +AC_SUBST(BUILD_VERSION) AC_SUBST(BUILD_FILEVERSION) BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` @@ -1774,6 +1776,7 @@ doc/Makefile tests/Makefile tests/openpgp/Makefile tests/pkits/Makefile +g10/gpg.w32-manifest ]) diff --git a/g10/Makefile.am b/g10/Makefile.am index b47b2eb23..0a021195a 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -18,7 +18,8 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc +EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc \ + gpg.w32-manifest.in AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ -I$(top_srcdir)/include -I$(top_srcdir)/intl @@ -57,6 +58,9 @@ endif if HAVE_W32_SYSTEM resource_objs += gpg-w32info.o + +gpg-w32info.o : gpg.w32-manifest + endif common_source = \ diff --git a/g10/gpg-w32info.rc b/g10/gpg-w32info.rc index 8caf221cc..cc34c30b4 100644 --- a/g10/gpg-w32info.rc +++ b/g10/gpg-w32info.rc @@ -48,3 +48,5 @@ VALUE "Translation", 0x409, 0x4b0 END END + +1 RT_MANIFEST "gpg.w32-manifest" diff --git a/g10/gpg.w32-manifest.in b/g10/gpg.w32-manifest.in new file mode 100644 index 000000000..8c98dc5a7 --- /dev/null +++ b/g10/gpg.w32-manifest.in @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<description>GNU Privacy Guard (OpenPGP tool)</description> +<assemblyIdentity + type="win32" + name="GnuPG.gpg" + version="@BUILD_VERSION@" + /> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 --> + </application> +</compatibility> +</assembly> |