[gedit/wip/wix] 64 vs 32

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 0e17e5d1dd515e7b83c02729a21caaa691fbd2f3
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Dec 22 13:47:07 2015 +0100

    64 vs 32

 win32/installer/defines.wxi |    8 +++++++-
 win32/installer/gedit.wxs   |    2 +-
 win32/make-gedit-installer  |    7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/win32/installer/defines.wxi b/win32/installer/defines.wxi
index 826879e..5faa759 100644
--- a/win32/installer/defines.wxi
+++ b/win32/installer/defines.wxi
@@ -1,5 +1,11 @@
 <Include>
-  <?define ProductName = "gedit Text Editor" ?>
+  <?if $(var.Platform) = x64 ?>
+    <?define ProductName = "gedit Text Editor (64 bit)" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?else ?>
+    <?define ProductName = "gedit Text Editor" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+  <?endif ?>
   <?define ProductVersion = "@VERSION@"?>
   <?define Manufacturer = "GNOME"?>
   <?define TopDir = "..\..\"?>
diff --git a/win32/installer/gedit.wxs b/win32/installer/gedit.wxs
index 11ed33a..dc98203 100644
--- a/win32/installer/gedit.wxs
+++ b/win32/installer/gedit.wxs
@@ -42,7 +42,7 @@
   <!-- Directory Tree -->
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.PlatformProgramFilesFolder)" Name="$(var.PlatformProgramFilesFolder)">
         <Directory Name="gedit" Id="gedit_dir">
           <Directory Id="INSTALLDIR">
             <Directory Name="license" Id="gedit_license" />
diff --git a/win32/make-gedit-installer b/win32/make-gedit-installer
index fdfc9d4..57092b0 100644
--- a/win32/make-gedit-installer
+++ b/win32/make-gedit-installer
@@ -104,9 +104,14 @@ setup_source_dir() {
 make_installer() {
   setup_source_dir
 
+  _platform="x86"
+  if [ "${_arch}" = "x86_64" ]; then
+    _platform="x64"
+  fi
+
   pushd "installer" > /dev/null
   "${_wixdir}/bin/heat.exe" dir SourceDir -gg -dr INSTALLDIR -cg binaries -sfrag -sreg -srd -suid -template 
fragment -out binaries.wxs
-  "${_wixdir}/bin/candle.exe" gedit.wxs binaries.wxs
+  "${_wixdir}/bin/candle.exe" -d Platform=${_platform} gedit.wxs binaries.wxs
   "${_wixdir}/bin/light.exe" -ext WixUtilExtension -ext WixUIExtension gedit.wixobj binaries.wixobj -o 
"/tmp/${_filename}"
   popd
 }