diff mbox series

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

Message ID 20171106101203.10508-5-aserdean@ovn.org
State Accepted
Headers show
Series [ovs-dev,v2,1/6] build-windows: Suppress output from MSBuild | expand

Commit Message

Alin-Gabriel Serdean Nov. 6, 2017, 10:12 a.m. UTC 
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>
---
v2: Change comment phrasing. Add acked
---
 windows/ovs-windows-installer/Product.wxs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs
index 599fd43..ea1bc68 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">