From 858c1d4f30123673a6db37efdb820b49148a70e4 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 27 Aug 2017 21:06:23 +0300 Subject: [PATCH] Fix msi creation script to work on 64 bit Windows. --- msi/createmsi.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 msi/createmsi.py diff --git a/msi/createmsi.py b/msi/createmsi.py old mode 100755 new mode 100644 index 4fbc2d6c7851..a6a29e4d297f --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -142,8 +142,11 @@ def create_xml(self, nodes, ofile, root): def build_package(self): - subprocess.check_call(['c:\\Program Files\\Wix Toolset v3.11\\bin\candle', self.main_xml]) - subprocess.check_call(['c:\\Program Files\\Wix Toolset v3.11\\bin\light', + wixdir = 'c:\\Program Files\\Wix Toolset v3.11\\bin' + if not os.path.isdir(wixdir): + wixdir = 'c:\\Program Files (x86)\\Wix Toolset v3.11\\bin' + subprocess.check_call([os.path.join(wixdir, 'candle'), self.main_xml]) + subprocess.check_call([os.path.join(wixdir, 'light'), '-ext', 'WixUIExtension', '-cultures:en-us', '-dWixUILicenseRtf=msi\\License.rtf',