diff options
| author | Alin Serdean <aserdean@cloudbasesolutions.com> | 2016-12-06 02:58:30 +0000 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2016-12-21 15:08:48 -0800 |
| commit | b61dd18bb69eb1897574f642777acfbbc16a6a5e (patch) | |
| tree | 0425d8b2a53ed0a0f79e7910c3dcd40361c1c0b7 /datapath-windows/ovsext/ovsext.rc | |
| parent | b4675b81a67be842a4b9dc19b7d0d43162bb5aa3 (diff) | |
| download | openvswitch-b61dd18bb69eb1897574f642777acfbbc16a6a5e.tar.gz | |
datapath-windows: Force driver version to depend on a variable
The following components use Windows driver information:
- System (inf file); used during device installation
- Resource file (rc file); used by applications when looking over the driver
file(sys)
Currently we have the following for the driver version number:
- (inf file) generated value from the build timestamp
- (rc file) predefined value
This patch forces both files to depend on a variable: '$(Version)'.
This is a predefined variable from Visual Studio.
To achieve the above we change the current project settings used by the
'stampinf' utility and we define a new preprocessor value named
'VersionWithCommas' (which is obtained by replacing all
'.' with ',' from $(Version) ).
Certain values from the resource file are expected to use ',' instead of '.' .
The resource file has been updated to use the new values when generating
information about the driver (sys).
The variable '$(Version' can be changed from the command line via the
'msbuild' utility.
Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows/ovsext/ovsext.rc')
| -rw-r--r-- | datapath-windows/ovsext/ovsext.rc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/datapath-windows/ovsext/ovsext.rc b/datapath-windows/ovsext/ovsext.rc index 0b92e2ea4..578367d2c 100644 --- a/datapath-windows/ovsext/ovsext.rc +++ b/datapath-windows/ovsext/ovsext.rc @@ -8,14 +8,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) +#define STR(x) #x ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,3,9600,17298 - PRODUCTVERSION 6,3,9600,17298 + FILEVERSION VersionWithCommas + PRODUCTVERSION VersionWithCommas FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -32,12 +33,12 @@ BEGIN BEGIN VALUE "CompanyName", "Open vSwitch" VALUE "FileDescription", "Open vSwitch Extension" - VALUE "FileVersion", "6.3.9600.17298" + VALUE "FileVersion", STR(Version) VALUE "InternalName", "OVSExt.SYS" VALUE "LegalCopyright", "Licensed under the Apache License, Version 2.0 (the ""License"")" VALUE "OriginalFilename", "OVSExt.SYS" - VALUE "ProductName", "Open vSwitch 8/8.1 DDK driver" - VALUE "ProductVersion", "6.3.9600.17298" + VALUE "ProductName", "Open vSwitch" + VALUE "ProductVersion", STR(Version) END END BLOCK "VarFileInfo" |