[ovs-dev] [PATCH 5/6] installer-windows: Modify installer so it can be compiled on x64

Alin Balutoiu abalutoiu at cloudbasesolutions.com
Thu Nov 2 17:18:12 UTC 2017


Minor comment inline.

Acked-by: Alin Balutoiu <abalutoiu at cloudbasesolutions.com>

> -----Original Message-----
> From: ovs-dev-bounces at openvswitch.org [mailto:ovs-dev-
> bounces at openvswitch.org] On Behalf Of Alin Gabriel Serdean
> Sent: Tuesday, October 31, 2017 6:26 PM
> To: dev at openvswitch.org
> Cc: Alin Gabriel Serdean <aserdean at ovn.org>
> Subject: [ovs-dev] [PATCH 5/6] installer-windows: Modify installer so it can
> be compiled on x64
> 
> Add variables to know for which platform we are building.
> 
> They are needed for the installer to know if it should install in `Program Files
> (x86)` or `Program Files` and which registry it needs to update.
> 
> Signed-off-by: Alin Gabriel Serdean <aserdean at ovn.org>
> ---
>  windows/ovs-windows-installer/Product.wxs | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-
> windows-installer/Product.wxs
> index 599fd43..e1d4f17 100644
> --- a/windows/ovs-windows-installer/Product.wxs
> +++ b/windows/ovs-windows-installer/Product.wxs
> @@ -16,6 +16,16 @@
>      under the License.
>    </copyright>
>  -->
> +<!--
> +  Predefine variables with regards of the platform we are building for
[Alin Balutoiu] Predefined*
> +-->
> +<?if $(var.Platform) = x64 ?>
> +  <?define Win64 = "yes" ?>
> +  <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
> +<?else ?>
> +  <?define Win64 = "no" ?>
> +  <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?endif
> +?>
>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
>       xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
>    <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open
> vSwitch for Hyper-V" Language="1033" Version="$(var.Version)"
> @@ -93,7 +103,7 @@
> 
>    <Fragment>
>      <Directory Id="TARGETDIR" Name="SourceDir">
> -      <Directory Id="ProgramFilesFolder">
> +      <Directory Id="$(var.PlatformProgramFilesFolder)">
>          <Directory Id="INSTALLDIR" Name="Open vSwitch" />
>        </Directory>
>        <Directory Id="CommonAppDataFolder">
> --
> 2.10.2.windows.1
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev


More information about the dev mailing list