[gedit/wip/wix] Pass the arch directly to candle



commit da69cf84fbbf0d7954b7e1e36aec5f3d6759c6cb
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Dec 22 14:08:42 2015 +0100

    Pass the arch directly to candle

 win32/installer/defines.wxi |    2 +-
 win32/make-gedit-installer  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/win32/installer/defines.wxi b/win32/installer/defines.wxi
index 5faa759..69bc08f 100644
--- a/win32/installer/defines.wxi
+++ b/win32/installer/defines.wxi
@@ -1,5 +1,5 @@
 <Include>
-  <?if $(var.Platform) = x64 ?>
+  <?if $(sys.BUILDARCH) = x64 ?>
     <?define ProductName = "gedit Text Editor (64 bit)" ?>
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?else ?>
diff --git a/win32/make-gedit-installer b/win32/make-gedit-installer
index 6fd38b7..c87039c 100644
--- a/win32/make-gedit-installer
+++ b/win32/make-gedit-installer
@@ -111,7 +111,7 @@ make_installer() {
 
   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" -dPlatform=${_platform} gedit.wxs binaries.wxs
+  "${_wixdir}/bin/candle.exe" -arch ${_platform} gedit.wxs binaries.wxs
   "${_wixdir}/bin/light.exe" -ext WixUtilExtension -ext WixUIExtension gedit.wixobj binaries.wixobj -o 
"/tmp/${_filename}"
   popd
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]