From 0f814d4c4a285573eef2391c70e21cf8126cafcb Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 3 Feb 2015 19:17:36 +0100
Subject: w32: Add a manifest to libgpg-error.

* src/gpg-error.w32-manifest.in: New.
* src/Makefile.am (EXTRA_DIST): Add it.
(versioninfo.lo): Depend on it.
* src/versioninfo.rc.in: Add it.
* configure.ac (AC_CONFIG_FILES): Add it.
(BUILD_VERSION): New.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 configure.ac                  |  9 +++++----
 src/Makefile.am               |  4 +++-
 src/gpg-error.w32-manifest.in | 17 +++++++++++++++++
 src/versioninfo.rc.in         |  1 +
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/gpg-error.w32-manifest.in

diff --git a/configure.ac b/configure.ac
index 0f9b194..dc3fb05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,12 +486,13 @@ AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
                    [GIT commit id revision used to build this package])
 
 changequote(,)dnl
-BUILD_FILEVERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
+BUILD_VERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./'`
 changequote([,])dnl
-BUILD_FILEVERSION="${BUILD_FILEVERSION}0,mym4_revision_dec"
+BUILD_VERSION="${BUILD_VERSION}0.mym4_revision_dec"
+BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
+AC_SUBST(BUILD_VERSION)
 AC_SUBST(BUILD_FILEVERSION)
 
-
 AC_ARG_ENABLE([build-timestamp],
               AC_HELP_STRING([--enable-build-timestamp],
                 [set an explicit build timestamp for reproducibility.
@@ -526,7 +527,7 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([doc/Makefile po/Makefile.in m4/Makefile])
 AC_CONFIG_FILES([src/Makefile tests/Makefile])
 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
-AC_CONFIG_FILES([src/versioninfo.rc])
+AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest])
 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
 
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 403f5d2..18a4cb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,8 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
 	mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
 	mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
 	err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
-	gpg-error.vers gpg-error.def.in versioninfo.rc.in \
+	gpg-error.vers gpg-error.def.in \
+        versioninfo.rc.in gpg-error.w32-manifest.in \
 	$(lock_obj_pub)
 
 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
@@ -120,6 +121,7 @@ export_symbols = -export-symbols gpg-error.def
 # no need to use this DLL.  Thus we force gcc to link that statically.
 extra_ltoptions = -XCClinker -static-libgcc
 
+versioninfo.lo : gpg-error.w32-manifest
 
 install-def-file: gpg-error.def
 	-$(INSTALL) -d $(DESTDIR)$(libdir)
diff --git a/src/gpg-error.w32-manifest.in b/src/gpg-error.w32-manifest.in
new file mode 100644
index 0000000..07f6891
--- /dev/null
+++ b/src/gpg-error.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>Error codes and shared functions for GnuPG and others</description>
+<assemblyIdentity
+    type="win32"
+    name="GnuPG.libgpg-error"
+    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>
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index bcf5893..8a053a9 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -50,3 +50,4 @@ BEGIN
     END
 END
 
+1 RT_MANIFEST "gpg-error.w32-manifest"
-- 
cgit v1.2.3