[ovs-dev,v3] datapath-windows: Set Version correctly for OVSExt

- Previously, the 'Version' property passed to MSBuild
  was not being passed to the RcComplile section. To
  use the value of 'Version' property in the rc file,
  it needs to be passed.

- Adds a macro to convert the Version to a string literal.
  Previously, the Version was simply being converted
  to a literal text 'Version' instead of the the version
  number passed using the 'Version' property to MSBuild.

Signed-off-by: Shashank Ram <rams@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 datapath-windows/ovsext/ovsext.rc      |  5 +++--
 datapath-windows/ovsext/ovsext.vcxproj | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

--
2.9.3.windows.2

On 17 May 2017 at 09:30, Shashank Ram <rams@vmware.com> wrote:

> - Previously, the 'Version' property passed to MSBuild
>   was not being passed to the RcComplile section. To
>   use the value of 'Version' property in the rc file,
>   it needs to be passed.
>
> - Adds a macro to convert the Version to a string literal.
>   Previously, the Version was simply being converted
>   to a literal text 'Version' instead of the the version
>   number passed using the 'Version' property to MSBuild.
>
> Signed-off-by: Shashank Ram <rams@vmware.com>
> Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
>
Applied to master, thank you!


> ---
>  datapath-windows/ovsext/ovsext.rc      |  5 +++--
>  datapath-windows/ovsext/ovsext.vcxproj | 12 ++++++------
>  2 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/datapath-windows/ovsext/ovsext.rc b/datapath-windows/ovsext/
> ovsext.rc
> index a7cf0a7..e6334c2 100644
> --- a/datapath-windows/ovsext/ovsext.rc
> +++ b/datapath-windows/ovsext/ovsext.rc
> @@ -9,6 +9,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
>  #pragma code_page(1252)
>
>  #define STR(x)                          #x
> +#define VER_TO_STR(v)                   STR(v)
>  ////////////////////////////////////////////////////////////
> /////////////////
>  //
>  // Version
> @@ -33,12 +34,12 @@ BEGIN
>          BEGIN
>              VALUE "CompanyName", "The Linux Foundation (R)"
>              VALUE "FileDescription", "Open vSwitch Extension"
> -            VALUE "FileVersion", STR(Version)
> +            VALUE "FileVersion", VER_TO_STR(VersionWithDots)
>              VALUE "InternalName", "OVSExt.SYS"
>              VALUE "LegalCopyright", "Licensed under the Apache License,
> Version 2.0 (the ""License"")"
>              VALUE "OriginalFilename", "OVSExt.SYS"
>              VALUE "ProductName", "Open vSwitch"
> -            VALUE "ProductVersion", STR(Version)
> +            VALUE "ProductVersion", VER_TO_STR(VersionWithDots)
>          END
>      END
>      BLOCK "VarFileInfo"
> diff --git a/datapath-windows/ovsext/ovsext.vcxproj
> b/datapath-windows/ovsext/ovsext.vcxproj
> index ecfc0b8..cccf066 100644
> --- a/datapath-windows/ovsext/ovsext.vcxproj
> +++ b/datapath-windows/ovsext/ovsext.vcxproj
> @@ -295,12 +295,12 @@
>      <ClCompile Include="Vport.c" />
>      <ClCompile Include="Vxlan.c" />
>      <ResourceCompile Include="ovsext.rc">
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> -      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithCommas=$(Version.Replace('.',','))</PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win8.1
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10
> Release|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
> +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Win10
> Debug|x64'">%(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;
> VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',','))</
> PreprocessorDefinitions>
>      </ResourceCompile>
>    </ItemGroup>
>    <ItemGroup>
> --
> 2.9.3.windows.2
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>