From abbb33e38c22e8579351239075c5b632e28078ca Mon Sep 17 00:00:00 2001
From: Alin Gabriel Serdean <aserdean@ovn.org>
Date: Mon, 6 Nov 2017 12:12:02 +0200
Subject: 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@ovn.org>
Acked-by: Alin Balutoiu <abalutoiu@cloudbasesolutions.com>
---
 windows/ovs-windows-installer/Product.wxs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'windows')

diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs
index 599fd4389..ea1bc6896 100644
--- a/windows/ovs-windows-installer/Product.wxs
+++ b/windows/ovs-windows-installer/Product.wxs
@@ -16,6 +16,16 @@
     under the License.
   </copyright>
 -->
+<!--
+  Predefined variables with regards of the platform we are building for
+-->
+<?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">
-- 
cgit v1.2.1