Peter M. Groen / libmodbus

Commit 16d3cacc7a0cc2cbbf40efc44ea2875c2e4db625

Authored by Stéphane Raimbault
1 parent fa9acd76

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

Inline Side-by-side
Showing 4 changed files with 11 additions and 18 deletions
.gitignore
  View file @16d3cac
@@ -22,7 +22,8 @@ missing @@ -22,7 +22,8 @@ missing
22 m4/ 22 m4/
23 libmodbus.pc 23 libmodbus.pc
24 libmodbus.spec 24 libmodbus.spec
25 -modbus-version.h 25 +src/modbus-version.h
  26 +src/win32/modbus.dll.manifest
26 .deps 27 .deps
27 .libs 28 .libs
28 *.la 29 *.la
configure.ac
  View file @16d3cac
@@ -139,6 +139,7 @@ AC_CONFIG_FILES([ @@ -139,6 +139,7 @@ AC_CONFIG_FILES([
139 Makefile 139 Makefile
140 src/Makefile 140 src/Makefile
141 src/modbus-version.h 141 src/modbus-version.h
  142 + src/win32/modbus.dll.manifest
142 doc/Makefile 143 doc/Makefile
143 tests/Makefile 144 tests/Makefile
144 libmodbus.pc 145 libmodbus.pc
src/win32/Readme-win32
  View file @16d3cac
1 -  
2 Intro 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 TODO 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
  View file @16d3cac
1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 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 <description>Zsh shell</description> 4 <description>Zsh shell</description>
5 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> 5 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
6 <security> 6 <security>