From 16d3cacc7a0cc2cbbf40efc44ea2875c2e4db625 Mon Sep 17 00:00:00 2001
From: Stéphane Raimbault <stephane.raimbault@gmail.com>
Date: Sun, 2 Sep 2012 22:18:59 +0200
Subject: [PATCH] Don't hardcode libmodbus version number in modbus.dll.manifest

---
 .gitignore                       |  3 ++-
 configure.ac                     |  1 +
 src/win32/Readme-win32           | 23 +++++++----------------
 src/win32/modbus.dll.manifest    | 14 --------------
 src/win32/modbus.dll.manifest.in | 14 ++++++++++++++
 5 files changed, 24 insertions(+), 31 deletions(-)
 delete mode 100644 src/win32/modbus.dll.manifest
 create mode 100644 src/win32/modbus.dll.manifest.in

diff --git a/.gitignore b/.gitignore
index 2f38378..a916122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,8 @@ missing
 m4/
 libmodbus.pc
 libmodbus.spec
-modbus-version.h
+src/modbus-version.h
+src/win32/modbus.dll.manifest
 .deps
 .libs
 *.la
diff --git a/configure.ac b/configure.ac
index e54409a..faf170f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ AC_CONFIG_FILES([
         Makefile
         src/Makefile
         src/modbus-version.h
+        src/win32/modbus.dll.manifest
         doc/Makefile
         tests/Makefile
         libmodbus.pc
diff --git a/src/win32/Readme-win32 b/src/win32/Readme-win32
index 31ebcdf..c08befb 100644
--- a/src/win32/Readme-win32
+++ b/src/win32/Readme-win32
@@ -1,26 +1,17 @@
-
 Intro
 -----
 
-This directory contains the project file for Visual
-Studio 2008 to build a modbus.dll.
-
-The project file searches for D:/include/msvc_std to
-find stdint.h. See ../../README.rst
-
-config.h and modbus-version.h were generated using
-a Windows native experimental port of zsh and Microsoft cl.
+This directory contains the project file for Visual Studio 2008 to build a
+modbus.dll.
 
-Please note that modbus.dll.manifest hardcodes
-the version number !
+The project file searches for D:/include/msvc_std to find stdint.h.
+See ../../README.rst
 
+config.h and modbus-version.h were generated using a Windows native experimental
+port of zsh and Microsoft cl.
 
 
 TODO
 ----
 
-Fix the ugly need to have config.h and modbus-version.h
-in this directory.
-
-
-oldfaber
+Fix the ugly need to have config.h and modbus-version.h in this directory.
diff --git a/src/win32/modbus.dll.manifest b/src/win32/modbus.dll.manifest
deleted file mode 100644
index 9934ce5..0000000
--- a/src/win32/modbus.dll.manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity	version="3.1.0.1"	processorArchitecture="*"	name="modbus"/>
-<description>Zsh shell</description>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-  </dependency>
-</assembly>
diff --git a/src/win32/modbus.dll.manifest.in b/src/win32/modbus.dll.manifest.in
new file mode 100644
index 0000000..22ae3e0
--- /dev/null
+++ b/src/win32/modbus.dll.manifest.in
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity version="@LIBMODBUS_VERSION@"	processorArchitecture="*" name="modbus"/>
+<description>Zsh shell</description>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+  </dependency>
+</assembly>
--
libgit2 0.21.4