Have the driver version display as major.minor.revision.build
PATCH 1/1 Have the driver version display as major.minor.revision.build
From: Selva Nair <[email protected]...>
The driver version (taken from the INF) and the file version of tap0901.sys file (from its resource) will now display like 9.22.1.601.
The driver details tab will continue to show the text form of the version as "major.minor.revision (major/minor)". Eg., "9.22.1 (9/22)"
---
Not sure this should be submitted as a PR or like this..
An image showing the version is here
https://user-images.githubusercontent.com/3981391/39222715-29500c5a-480c-11e8-823a-73328baf69dd.PNG
But I would like to test again using a properly signed version
src/OemVista.inf.in | 2 +- src/config.h.in | 2 ++ src/resource.rc | 2 +- version.m4 | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-)
src/OemVista.inf.in +1 -1
@@ -55,7 +55,7 @@ ; This version number should match the version ; number given in SOURCES. - DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@[email protected]...@PRODUCT_TAP_WIN_MINOR@ + DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@[email protected]...@[email protected]...@[email protected]...@PRODUCT_TAP_WIN_BUILD@ [Strings] DeviceDescription = "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@"
src/config.h.in +2 -0
@@ -7,3 +7,5 @@ #define PRODUCT_TAP_WIN_PROVIDER "@PRODUCT_TAP_WIN_PROVIDER@" #define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" #define PRODUCT_TAP_WIN_RELDATE "@PRODUCT_TAP_WIN_RELDATE@" +#define PRODUCT_TAP_WIN_REVISION @PRODUCT_TAP_WIN_REVISION@ +#define PRODUCT_TAP_WIN_BUILD @PRODUCT_TAP_WIN_BUILD@
src/resource.rc +1 -1
@@ -44,7 +44,7 @@ #define VER_PRODUCTNAME_STR VER_FILEDESCRIPTION_STR -#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,00,00,PRODUCT_TAP_WIN_MINOR +#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,PRODUCT_TAP_WIN_MINOR,PRODUCT_TAP_WIN_REVISION,PRODUCT_TAP_WIN_BUILD #define XSTR(s) STR(s) #define STR(s) #s
version.m4 +2 -2
@@ -2,7 +2,7 @@ dnl define the TAP version define([PRODUCT_NAME], [TAP-Windows]) define([PRODUCT_PUBLISHER], [OpenVPN Technologies, Inc.]) define([PRODUCT_VERSION], [9.22.1]) -define([PRODUCT_VERSION_RESOURCE], [9,0,0,22]) +define([PRODUCT_VERSION_RESOURCE], [9,22,1,601]) define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901]) define([PRODUCT_TAP_WIN_MAJOR], [9]) define([PRODUCT_TAP_WIN_MINOR], [22])
@@ -11,4 +11,4 @@ define([PRODUCT_TAP_WIN_BUILD], [601]) define([PRODUCT_TAP_WIN_PROVIDER], [TAP-Windows Provider V9]) define([PRODUCT_TAP_WIN_CHARACTERISTICS], [0x81]) define([PRODUCT_TAP_WIN_DEVICE_DESCRIPTION], [TAP-Windows Adapter V9]) -define([PRODUCT_TAP_WIN_RELDATE], [04/15/2018]) +define([PRODUCT_TAP_WIN_RELDATE], [04/24/2018])
Signature · 1 line
2.6.2
Hi,
Quoted 6 lines · On Tue, Apr 24, 2018 at 10:25:20PM -0400, [email protected]... wrote:
From: Selva Nair <[email protected]...>
The driver version (taken from the INF) and the file version of tap0901.sys file (from its resource) will now display like 9.22.1.601.
Quoted 8 lines
The driver details tab will continue to show the text form of the version as "major.minor.revision (major/minor)". Eg., "9.22.1 (9/22)"
Signed-off-by Selva Nair <[email protected]...>---
Not sure this should be submitted as a PR or like this..
Not sure either (tap-windows6 has seen so little development that we never defined a proper process, I think).
So I just ACK this here on the basis of "we did not know how to do it, but this is what we wanted to achieve" - it *looks* reasonable.
So if Samuli can be convinced to build a driver with this merged and a signature, I'm happy to give it a test run and see if everything is happy...
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...A message that is not in the archive (sent off-list or not yet received): [email protected]...
Hi,
Quoted 2 lines · Samuli Seppänen
Feature-ACK, but I have not tested this yet. I think we should increment version to 9.22.2 (a.k.a. 9,22,2,601) though. The current release is 9.22.1.
Treating this like any other patch, I think version bump should not be a part of it, but done only at the point of release as usual. So let's keep the purpose here to just change how version is displayed.
But I did change the date by mistake (left behind from testing) -- will send a v2 which keeps the version number and date as is (and update the PR as well).
That said, when a signed test version is made, please bump the version and date for testing that it does get recognized as the latest by Windows. I could not properly test that due to lack of signature
Selva
Il 25/04/2018 15:42, Selva Nair ha scritto:
Quoted 14 lines
Hi,
Quoted 2 lines · Samuli Seppänen
Feature-ACK, but I have not tested this yet. I think we should increment version to 9.22.2 (a.k.a. 9,22,2,601) though. The current release is 9.22.1.
Treating this like any other patch, I think version bump should not be a part of it, but done only at the point of release as usual. So let's keep the purpose here to just change how version is displayed.
But I did change the date by mistake (left behind from testing) -- will send a v2 which keeps the version number and date as is (and update the PR as well).
Quoted 6 lines
That said, when a signed test version is made, please bump the version and date for testing that it does get recognized as the latest by Windows. I could not properly test that due to lack of signature
Selva
Sounds reasonable.
Signature · 5 lines
Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock
PATCH v2 1/1 Have the driver version display as major.minor.revision.build
In reply to [email protected]...From: Selva Nair <[email protected]...>
The driver version (taken from the INF) and the file version of tap0901.sys file (from its resource) will now display like 9.22.1.601.
The driver details tab will continue to show the text form of the version as "major.minor.revision major/minor". Eg., "9.22.1 9/22"
---
v2: reverted the date back to 04/15/2018 assuming both
version and date will be changed at release time
Note: PRODUCT_VERSION_RESOURCE in version.m4 appears to be unused, so it may be an unnecessary burden to keep it up to date? FWIW, I've updated it to the 9,22,1,601 form.
Not sure this should be submitted as a PR or like this..
An image showing the version is here
https://user-images.githubusercontent.com/3981391/39222715-29500c5a-480c-11e8-823a-73328baf69dd.PNG
But I would like to test again using a properly signed version
src/OemVista.inf.in | 2 +- src/config.h.in | 2 ++ src/resource.rc | 2 +- version.m4 | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)
src/OemVista.inf.in +1 -1
@@ -55,7 +55,7 @@ ; This version number should match the version ; number given in SOURCES. - DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@[email protected]...@PRODUCT_TAP_WIN_MINOR@ + DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@[email protected]...@[email protected]...@[email protected]...@PRODUCT_TAP_WIN_BUILD@ [Strings] DeviceDescription = "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@"
src/config.h.in +2 -0
@@ -7,3 +7,5 @@ #define PRODUCT_TAP_WIN_PROVIDER "@PRODUCT_TAP_WIN_PROVIDER@" #define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@" #define PRODUCT_TAP_WIN_RELDATE "@PRODUCT_TAP_WIN_RELDATE@" +#define PRODUCT_TAP_WIN_REVISION @PRODUCT_TAP_WIN_REVISION@ +#define PRODUCT_TAP_WIN_BUILD @PRODUCT_TAP_WIN_BUILD@
src/resource.rc +1 -1
@@ -44,7 +44,7 @@ #define VER_PRODUCTNAME_STR VER_FILEDESCRIPTION_STR -#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,00,00,PRODUCT_TAP_WIN_MINOR +#define VER_PRODUCTVERSION PRODUCT_TAP_WIN_MAJOR,PRODUCT_TAP_WIN_MINOR,PRODUCT_TAP_WIN_REVISION,PRODUCT_TAP_WIN_BUILD #define XSTR(s) STR(s) #define STR(s) #s
version.m4 +1 -1
@@ -2,7 +2,7 @@ dnl define the TAP version define([PRODUCT_NAME], [TAP-Windows]) define([PRODUCT_PUBLISHER], [OpenVPN Technologies, Inc.]) define([PRODUCT_VERSION], [9.22.1]) -define([PRODUCT_VERSION_RESOURCE], [9,0,0,22]) +define([PRODUCT_VERSION_RESOURCE], [9,22,1,601]) define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901]) define([PRODUCT_TAP_WIN_MAJOR], [9]) define([PRODUCT_TAP_WIN_MINOR], [22])
Signature · 1 line
2.6.2