diff options
| author | Shashank Ram <rams@vmware.com> | 2017-05-17 09:30:49 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2017-05-17 09:49:57 -0700 |
| commit | 73e8c580eef4651370938fb9355d0b6fd8b3f54a (patch) | |
| tree | 514f4edc6b23c2e8dba764ef223bf84ad6103780 /datapath-windows | |
| parent | 85c55772a453fc18ab7a7033761bfe2466c5c804 (diff) | |
| download | openvswitch-73e8c580eef4651370938fb9355d0b6fd8b3f54a.tar.gz | |
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>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows')
| -rw-r--r-- | datapath-windows/ovsext/ovsext.rc | 5 | ||||
| -rw-r--r-- | 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 a7cf0a7d2..e6334c231 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 ecfc0b884..cccf06669 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> |