diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-27 21:06:23 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-27 21:06:23 +0300 |
| commit | 858c1d4f30123673a6db37efdb820b49148a70e4 (patch) | |
| tree | daef6bf7b5a2c41b13e9b56592af1f5c45e90ac1 /msi | |
| parent | 1cd037b578a7d4b731d28728bceb8eed4f633ce5 (diff) | |
| download | meson-858c1d4f30123673a6db37efdb820b49148a70e4.zip meson-858c1d4f30123673a6db37efdb820b49148a70e4.tar.gz meson-858c1d4f30123673a6db37efdb820b49148a70e4.tar.bz2 | |
Fix msi creation script to work on 64 bit Windows.
Diffstat (limited to 'msi')
| -rw-r--r--[-rwxr-xr-x] | msi/createmsi.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py index 4fbc2d6..a6a29e4 100755..100644 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -142,8 +142,11 @@ class PackageGenerator: 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', |