github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Update version-info resource 

- Add PRODUCTVERSION to the VERSIONINFO resource.
  Without this some versions of Windows (e.g., Server 2008 32bit)
  displays Product version = 0.0.0.0, File version = 11.1.0.0

- Also define the file and product versions in the stringinfo block
  as a stringified form of PACKAGE_VERSION_RESOURCE (e.g., "11.1.0.0").
  Windows versions that take the Product version from this block
  will now get the same value as older versions that use PRODUCTVERSION.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/98/head
Selva Nair 2016-11-18 17:45:21 -05:00
parent 23771164a2
commit dca8160a37
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -23,6 +23,7 @@ define([_GUI_VERSION_MAJOR], [11])
define([_GUI_VERSION_MINOR], [1]) define([_GUI_VERSION_MINOR], [1])
AC_INIT([OpenVPN GUI],[_GUI_VERSION_MAJOR],[openvpn-devel@lists.sourceforge.net],[openvpn-gui],[https://github.com/openvpn/openvpn-gui/]) AC_INIT([OpenVPN GUI],[_GUI_VERSION_MAJOR],[openvpn-devel@lists.sourceforge.net],[openvpn-gui],[https://github.com/openvpn/openvpn-gui/])
AC_DEFINE([PACKAGE_VERSION_RESOURCE], [_GUI_VERSION_MAJOR,_GUI_VERSION_MINOR,0,0], [Version in windows resource format]) AC_DEFINE([PACKAGE_VERSION_RESOURCE], [_GUI_VERSION_MAJOR,_GUI_VERSION_MINOR,0,0], [Version in windows resource format])
AC_DEFINE([PACKAGE_VERSION_RESOURCE_STR], ["_GUI_VERSION_MAJOR._GUI_VERSION_MINOR.0.0"], [Version as a string])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([main.h]) AC_CONFIG_SRCDIR([main.h])

5
res/openvpn-gui-res.rc
View File

@ -59,6 +59,7 @@ ID_ICO_DISCONNECTED ICON DISCARDABLE "disconnected.ico"
/* Version information and such */ /* Version information and such */
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION PACKAGE_VERSION_RESOURCE FILEVERSION PACKAGE_VERSION_RESOURCE
PRODUCTVERSION PACKAGE_VERSION_RESOURCE
FILEOS VOS_NT FILEOS VOS_NT
FILETYPE VFT_APP FILETYPE VFT_APP
BEGIN BEGIN
@ -89,11 +90,11 @@ BEGIN
BLOCK "040904B0" /* en_US, Unicode */ BLOCK "040904B0" /* en_US, Unicode */
BEGIN BEGIN
VALUE "FileDescription", PACKAGE_NAME " for Windows" VALUE "FileDescription", PACKAGE_NAME " for Windows"
VALUE "FileVersion", PACKAGE_VERSION VALUE "FileVersion", PACKAGE_VERSION_RESOURCE_STR
VALUE "InternalName", PACKAGE_TARNAME VALUE "InternalName", PACKAGE_TARNAME
VALUE "OriginalFilename", PACKAGE_TARNAME ".exe" VALUE "OriginalFilename", PACKAGE_TARNAME ".exe"
VALUE "ProductName", PACKAGE_NAME VALUE "ProductName", PACKAGE_NAME
VALUE "ProductVersion", PACKAGE_VERSION VALUE "ProductVersion", PACKAGE_VERSION_RESOURCE_STR
VALUE "Website", PACKAGE_URL VALUE "Website", PACKAGE_URL
VALUE "LegalCopyright", "The " PACKAGE_NAME " developers" VALUE "LegalCopyright", "The " PACKAGE_NAME " developers"
VALUE "CompanyName", PACKAGE_NAME VALUE "CompanyName", PACKAGE_NAME