diff options
| author | Niklas Claesson <niklas.claesson@cosylab.com> | 2017-10-09 22:22:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-11 00:09:27 +0300 |
| commit | 16aa40875e642d22ce0aaa45ab7a6ed8d9632ee3 (patch) | |
| tree | 0a2de93fe41fa24be464635a448a394a954c4f5d /msi/createmsi.py | |
| parent | b5eb77ddff42d165dbb6972739114ea9e130fec1 (diff) | |
| download | meson-16aa40875e642d22ce0aaa45ab7a6ed8d9632ee3.zip meson-16aa40875e642d22ce0aaa45ab7a6ed8d9632ee3.tar.gz meson-16aa40875e642d22ce0aaa45ab7a6ed8d9632ee3.tar.bz2 | |
MSI: Find VC redistributable with python 32bit on windows 64bit
Diffstat (limited to 'msi/createmsi.py')
| -rwxr-xr-x | msi/createmsi.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py index c045a3e..7f165d8 100755 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -43,6 +43,9 @@ class PackageGenerator: self.main_xml = 'meson.wxs' self.main_o = 'meson.wixobj' self.bytesize = 32 if '32' in platform.architecture()[0] else 64 + # rely on the environment variable since python architecture may not be the same as system architecture + if 'PROGRAMFILES(X86)' in os.environ: + self.bytesize = 64 self.final_output = 'meson-%s-%d.msi' % (self.version, self.bytesize) self.staging_dirs = ['dist', 'dist2'] if self.bytesize == 64: @@ -50,7 +53,7 @@ class PackageGenerator: self.redist_path = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x64.msm' else: self.progfile_dir = 'ProgramFilesFolder' - self.redist_path = 'c:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x86.msm' + self.redist_path = 'C:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x86.msm' self.component_num = 0 self.feature_properties = { self.staging_dirs[0]: { |