Update MSI creator script to newest VS on Win 7. [skip ci]
@@ -43,9 +43,6 @@ 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:
@@ -53,7 +50,7 @@ class PackageGenerator:
redist_glob = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x64.msm'
else:
self.progfile_dir = 'ProgramFilesFolder'
- redist_glob = 'C:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC141_CRT_x86.msm'
+ redist_glob = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x86.msm'
trials = glob(redist_glob)
if len(trials) != 1:
sys.exit('Could not find unique MSM setup.')
