Acked-by: Sairam Venugopal <vsai...@vmware.com>
On 12/5/16, 6:58 PM, "Alin Serdean" <aserd...@cloudbasesolutions.com> wrote: >Currently we have a predefined variable for the product version. > >This patch adds a new variable called 'Version' to the MSI project and >uses it for the product version. > >If the variable is not specified via the command line it will have >the default value of '1.0.0.0'. > >Signed-off-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com> >--- > windows/ovs-windows-installer/Product.wxs | 2 +- > .../ovs-windows-installer/ovs-windows-installer.wixproj | 15 >++++++++------- > 2 files changed, 9 insertions(+), 8 deletions(-) > >diff --git a/windows/ovs-windows-installer/Product.wxs >b/windows/ovs-windows-installer/Product.wxs >index 8b58729..15cd909 100644 >--- a/windows/ovs-windows-installer/Product.wxs >+++ b/windows/ovs-windows-installer/Product.wxs >@@ -18,7 +18,7 @@ > --> > <Wix >xmlns="https://urldefense.proofpoint.com/v2/url?u=http-3A__schemas.microso >ft.com_wix_2006_wi&d=DgICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Z6vowHUOjP5ysP_g372 >c49Nqc1vEKqHKNBkR5Q5Z7uo&m=0sdSlTY86eH_q1UeU18iAAlzSRzTxphJPas8yV0MxUo&s=t >wTXSbN4oeTOYKZ0rhknRPrVdIt7Oj0kcHNb1ZZ-EvE&e= " > >xmlns:util="https://urldefense.proofpoint.com/v2/url?u=http-3A__schemas.mi >crosoft.com_wix_UtilExtension&d=DgICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Z6vowHUO >jP5ysP_g372c49Nqc1vEKqHKNBkR5Q5Z7uo&m=0sdSlTY86eH_q1UeU18iAAlzSRzTxphJPas8 >yV0MxUo&s=5KNWvCeMbXddAl0cWaC_I4hW6sQ4ZkWbh34l4EVm-Jo&e= "> >- <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open >vSwitch for Hyper-V" Language="1033" Version="1.0.0.0" >+ <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open >vSwitch for Hyper-V" Language="1033" Version="$(var.Version)" > Manufacturer="Open vSwitch" >UpgradeCode="da802b12-433d-4742-a7ae-783aa0c48222"> > <Package InstallerVersion="405" Compressed="yes" >InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> > >diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj >b/windows/ovs-windows-installer/ovs-windows-installer.wixproj >index 30b5d55..f0e8f50 100644 >--- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj >+++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj >@@ -10,16 +10,17 @@ > <OutputType>Package</OutputType> > <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND >'$(MSBuildExtensionsPath32)' != '' >">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPat >h> > <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' >">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> >+ <Version Condition=" '$(Version)' == '' ">1.0.0.0</Version> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Debug|x86' "> > <OutputPath>bin\$(Configuration)\</OutputPath> > ><IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> >- <DefineConstants>Debug</DefineConstants> >+ <DefineConstants>Debug;Version=$(Version)</DefineConstants> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Release|x86' "> > <OutputPath>bin\$(Configuration)\</OutputPath> > ><IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> >- ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstan >ts> >+ ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Versi >on)</DefineConstants> > <SuppressAllWarnings>False</SuppressAllWarnings> > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> >@@ -30,7 +31,7 @@ > ><IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOut >putPath> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Release|x64' "> >- ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstan >ts> >+ ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Versi >on)</DefineConstants> > <SuppressAllWarnings>False</SuppressAllWarnings> > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> >@@ -38,12 +39,12 @@ > ><IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOut >putPath> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Debug|x64' "> >- <DefineConstants>Debug</DefineConstants> >+ <DefineConstants>Debug;Version=$(Version)</DefineConstants> > <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > ><IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOut >putPath> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Release|x64' "> >- ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstan >ts> >+ ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Versi >on)</DefineConstants> > <SuppressAllWarnings>False</SuppressAllWarnings> > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> >@@ -51,12 +52,12 @@ > ><IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOut >putPath> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Debug|x64' "> >- <DefineConstants>Debug</DefineConstants> >+ <DefineConstants>Debug;Version=$(Version)</DefineConstants> > <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > ><IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOut >putPath> > </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == >'Release|x64' "> >- ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstan >ts> >+ ><DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Versi >on)</DefineConstants> > <SuppressAllWarnings>False</SuppressAllWarnings> > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> >-- >2.10.2.windows.1 >_______________________________________________ >dev mailing list >d...@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_ >mailman_listinfo_ovs-2Ddev&d=DgICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Z6vowHUOjP5 >ysP_g372c49Nqc1vEKqHKNBkR5Q5Z7uo&m=0sdSlTY86eH_q1UeU18iAAlzSRzTxphJPas8yV0 >MxUo&s=RQ8LnJy4spZCCyXJS6uwWeZh6LwosjdyRatDuIos6MY&e= _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
