| Message ID | 20171031172537.2292-3-aserdean@ovn.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | installer fixes on msbuild64 | expand |
Acked-by: Alin Balutoiu <abalutoiu@cloudbasesolutions.com> > -----Original Message----- > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev- > bounces@openvswitch.org] On Behalf Of Alin Gabriel Serdean > Sent: Tuesday, October 31, 2017 6:26 PM > To: dev@openvswitch.org > Cc: Alin Gabriel Serdean <aserdean@ovn.org> > Subject: [ovs-dev] [PATCH 2/6] installer-windows: Remove unused entries > from WIX project > > Remove duplicate and obsolete entries from the installer WIX project. > > Found by inspection. > > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> > --- > .../ovs-windows-installer.wixproj | 36 ---------------------- > 1 file changed, 36 deletions(-) > > diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj > b/windows/ovs-windows-installer/ovs-windows-installer.wixproj > index f0e8f50..a8256ed 100644 > --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj > +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj > @@ -12,11 +12,6 @@ > <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' > ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsP > ath> > <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;Version=$(Version)</DefineConstants> > - </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == > 'Release|x86' "> > <OutputPath>bin\$(Configuration)\</OutputPath> > > <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath > > > @@ -25,37 +20,6 @@ > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > </PropertyGroup> > - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' > "> > - <DefineConstants>Debug</DefineConstants> > - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > - > <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</Intermediat > eOutputPath> > - </PropertyGroup> > - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == > 'Release|x64' "> > - > <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$( > Version)</DefineConstants> > - <SuppressAllWarnings>False</SuppressAllWarnings> > - <Pedantic>False</Pedantic> > - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > - > <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</Intermediat > eOutputPath> > - </PropertyGroup> > - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' > "> > - <DefineConstants>Debug;Version=$(Version)</DefineConstants> > - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > - > <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</Intermediat > eOutputPath> > - </PropertyGroup> > - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == > 'Release|x64' "> > - > <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$( > Version)</DefineConstants> > - <SuppressAllWarnings>False</SuppressAllWarnings> > - <Pedantic>False</Pedantic> > - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > - > <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</Intermediat > eOutputPath> > - </PropertyGroup> > - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' > "> > - <DefineConstants>Debug;Version=$(Version)</DefineConstants> > - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > - > <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</Intermediat > eOutputPath> > - </PropertyGroup> > <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == > 'Release|x64' "> > > <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$( > Version)</DefineConstants> > <SuppressAllWarnings>False</SuppressAllWarnings> > -- > 2.10.2.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index f0e8f50..a8256ed 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -12,11 +12,6 @@ <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;Version=$(Version)</DefineConstants> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> @@ -25,37 +20,6 @@ <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <DefineConstants>Debug</DefineConstants> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> - <SuppressAllWarnings>False</SuppressAllWarnings> - <Pedantic>False</Pedantic> - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <DefineConstants>Debug;Version=$(Version)</DefineConstants> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> - <SuppressAllWarnings>False</SuppressAllWarnings> - <Pedantic>False</Pedantic> - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <DefineConstants>Debug;Version=$(Version)</DefineConstants> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> <SuppressAllWarnings>False</SuppressAllWarnings>
Remove duplicate and obsolete entries from the installer WIX project. Found by inspection. Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> --- .../ovs-windows-installer.wixproj | 36 ---------------------- 1 file changed, 36 deletions(-)