[Openvpn-devel,tap-windows6] Have the driver version display as major.minor.revision.build

Message ID 1524623120-23498-1-git-send-email-selva.nair@gmail.com
State Superseded
Headers show
Series
  • [Openvpn-devel,tap-windows6] Have the driver version display as major.minor.revision.build
Related show

Commit Message

Selva Nair April 25, 2018, 2:25 a.m.
From: Selva Nair <selva.nair@gmail.com>

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)"

Signed-off-by: Selva Nair <selva.nair@gmail.com>
---

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(-)

Comments

Gert Doering April 25, 2018, 6:12 a.m. | #1
Hi,

On Tue, Apr 24, 2018 at 10:25:20PM -0400, selva.nair@gmail.com wrote:
> From: Selva Nair <selva.nair@gmail.com>
> 
> 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)"
> 
> Signed-off-by: Selva Nair <selva.nair@gmail.com>
> ---
> 
> 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
Selva Nair April 25, 2018, 12:42 p.m. | #2
Hi,

On Wed, Apr 25, 2018 at 3:04 AM, Samuli Seppänen <samuli@openvpn.net> wrote:
> 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

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Samuli Seppänen April 25, 2018, 3:38 p.m. | #3
Il 25/04/2018 15:42, Selva Nair ha scritto:
> Hi,
> 
> On Wed, Apr 25, 2018 at 3:04 AM, Samuli Seppänen <samuli@openvpn.net> wrote:
>> 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
> 

Sounds reasonable.

Patch

diff --git a/src/OemVista.inf.in b/src/OemVista.inf.in
index 004ed62..26152f5 100644
--- a/src/OemVista.inf.in
+++ b/src/OemVista.inf.in
@@ -55,7 +55,7 @@ 
 
 ; This version number should match the version
 ; number given in SOURCES.
-   DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@PRODUCT_TAP_WIN_MAJOR@.00.00.@PRODUCT_TAP_WIN_MINOR@
+   DriverVer=@PRODUCT_TAP_WIN_RELDATE@,@PRODUCT_TAP_WIN_MAJOR@.@PRODUCT_TAP_WIN_MINOR@.@PRODUCT_TAP_WIN_REVISION@.@PRODUCT_TAP_WIN_BUILD@
 
 [Strings]
    DeviceDescription = "@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@"
diff --git a/src/config.h.in b/src/config.h.in
index 322afa8..c013348 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -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@
diff --git a/src/resource.rc b/src/resource.rc
index 3c40d03..229e437 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -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
diff --git a/version.m4 b/version.m4
index 1d7f92e..955b418 100644
--- a/version.m4
+++ b/version.m4
@@ -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])