Browse Source

Update MSI creator script to newest VS on Win 7. [skip ci]

Jussi Pakkanen 1 month ago
parent
commit
da9fe8db2a
1 changed files with 1 additions and 4 deletions
  1. 1
    4
      msi/createmsi.py

+ 1
- 4
msi/createmsi.py View File

@@ -43,9 +43,6 @@ class PackageGenerator:
43 43
         self.main_xml = 'meson.wxs'
44 44
         self.main_o = 'meson.wixobj'
45 45
         self.bytesize = 32 if '32' in platform.architecture()[0] else 64
46
-        # rely on the environment variable since python architecture may not be the same as system architecture
47
-        if 'PROGRAMFILES(X86)' in os.environ:
48
-            self.bytesize = 64
49 46
         self.final_output = 'meson-%s-%d.msi' % (self.version, self.bytesize)
50 47
         self.staging_dirs = ['dist', 'dist2']
51 48
         if self.bytesize == 64:
@@ -53,7 +50,7 @@ class PackageGenerator:
53 50
             redist_glob = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x64.msm'
54 51
         else:
55 52
             self.progfile_dir = 'ProgramFilesFolder'
56
-            redist_glob = 'C:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC141_CRT_x86.msm'
53
+            redist_glob = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x86.msm'
57 54
         trials = glob(redist_glob)
58 55
         if len(trials) != 1:
59 56
             sys.exit('Could not find unique MSM setup.')

Loading…
Cancel
Save