Fix msi creation script to work on 64 bit Windows.

mniestroj · Aug 27, 2017 · 858c1d4 · 858c1d4
1 parent 1cd037b
commit 858c1d4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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',