Commit 16d3cacc7a0cc2cbbf40efc44ea2875c2e4db625

Authored by Stéphane Raimbault
1 parent fa9acd76

Don't hardcode libmodbus version number in modbus.dll.manifest

.gitignore
... ... @@ -22,7 +22,8 @@ missing
22 22 m4/
23 23 libmodbus.pc
24 24 libmodbus.spec
25   -modbus-version.h
  25 +src/modbus-version.h
  26 +src/win32/modbus.dll.manifest
26 27 .deps
27 28 .libs
28 29 *.la
... ...
configure.ac
... ... @@ -139,6 +139,7 @@ AC_CONFIG_FILES([
139 139 Makefile
140 140 src/Makefile
141 141 src/modbus-version.h
  142 + src/win32/modbus.dll.manifest
142 143 doc/Makefile
143 144 tests/Makefile
144 145 libmodbus.pc
... ...
src/win32/Readme-win32
1   -
2 1 Intro
3 2 -----
4 3  
5   -This directory contains the project file for Visual
6   -Studio 2008 to build a modbus.dll.
7   -
8   -The project file searches for D:/include/msvc_std to
9   -find stdint.h. See ../../README.rst
10   -
11   -config.h and modbus-version.h were generated using
12   -a Windows native experimental port of zsh and Microsoft cl.
  4 +This directory contains the project file for Visual Studio 2008 to build a
  5 +modbus.dll.
13 6  
14   -Please note that modbus.dll.manifest hardcodes
15   -the version number !
  7 +The project file searches for D:/include/msvc_std to find stdint.h.
  8 +See ../../README.rst
16 9  
  10 +config.h and modbus-version.h were generated using a Windows native experimental
  11 +port of zsh and Microsoft cl.
17 12  
18 13  
19 14 TODO
20 15 ----
21 16  
22   -Fix the ugly need to have config.h and modbus-version.h
23   -in this directory.
24   -
25   -
26   -oldfaber
  17 +Fix the ugly need to have config.h and modbus-version.h in this directory.
... ...
src/win32/modbus.dll.manifest renamed to src/win32/modbus.dll.manifest.in
1 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 2 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3   -<assemblyIdentity version="3.1.0.1" processorArchitecture="*" name="modbus"/>
  3 +<assemblyIdentity version="@LIBMODBUS_VERSION@" processorArchitecture="*" name="modbus"/>
4 4 <description>Zsh shell</description>
5 5 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
6 6 <security>
... ...