Acked-by: Alin Balutoiu
> -Original Message-
> From: ovs-dev-boun...@openvswitch.org [mailto:ovs-dev-
> boun...@openvswitch.org] On Behalf Of Alin Gabriel Serdean
> Sent: Tuesday, October 31, 2017 6:26 PM
> To: d...@openvswitch.org
> Cc: Alin Gabriel Serdean
> Subject: [ovs-dev] [PATCH 4/6] installer-windows: Call WIX binaries outside
> of MSBuild on x64
>
> Unfortunately all WIX binaries (candle, heat, etc) are only 32 bit (up to the
> latest version 3.11).
>
> For performance reasons they are run as .NET assemblies inside the MSBuild
> process. Running 32 bit assemblies inside a 64 bit process (MSBuild) makes
> them segfault.
>
> Add a new option for heat to be run as an individual process when the
> platform is not x86.
>
> Signed-off-by: Alin Gabriel Serdean
> ---
> windows/ovs-windows-installer/ovs-windows-installer.wixproj | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj
> b/windows/ovs-windows-installer/ovs-windows-installer.wixproj
> index a8256ed..241d605 100644
> --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj
> +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj
> @@ -13,6 +13,7 @@
> 1.0.0.0
>
>
> +true
> bin\$(Configuration)\
>
> obj\$(Configuration)\ >
>
> BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(
> Version)
> @@ -21,6 +22,7 @@
> 1076;
>
>
> +true
>
> BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(
> Version)
> False
> False
> @@ -67,9 +69,9 @@
>
>
>
> - Directory="Binaries" ComponentGroupName="BinariesComponentGroup"
> ToolPath="$(WixToolPath)" PreprocessorVariable="var.BinariesPath"
> GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true"
> KeepEmptyDirectories="true" SuppressRootDirectory="true">
> + + DirectoryRefId="BINARIESDIR" OutputFile="Binaries.wxs"
> + Directory="Binaries" ComponentGroupName="BinariesComponentGroup"
> + ToolPath="$(WixToolPath)" PreprocessorVariable="var.BinariesPath"
> + GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true"
> + KeepEmptyDirectories="true" SuppressRootDirectory="true">
>
> - Directory="Symbols" ComponentGroupName="SymbolsComponentGroup"
> ToolPath="$(WixToolPath)" PreprocessorVariable="var.SymbolsPath"
> GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true"
> KeepEmptyDirectories="true" SuppressRootDirectory="true">
> + + DirectoryRefId="SYMBOLSDIR" OutputFile="Symbols.wxs"
> + Directory="Symbols"
> ComponentGroupName="SymbolsComponentGroup"
> + ToolPath="$(WixToolPath)" PreprocessorVariable="var.SymbolsPath"
> + GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true"
> + KeepEmptyDirectories="true" SuppressRootDirectory="true">
>
>
> 2.10.2.windows.1
>
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
