diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-30 21:37:53 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-30 21:37:53 +0200 |
| commit | 025e11c9a72f313c6fa667e085b1de0e55a38781 (patch) | |
| tree | 404a2f65a64293c66bb98cf3bb5a38996eb42cb6 | |
| parent | 6eee9e48bbf43e2be511fbdf1b2bcfee32f614ef (diff) | |
| download | meson-025e11c9a72f313c6fa667e085b1de0e55a38781.zip meson-025e11c9a72f313c6fa667e085b1de0e55a38781.tar.gz meson-025e11c9a72f313c6fa667e085b1de0e55a38781.tar.bz2 | |
Fix looking up Visual Studio MSMs. Again. [skip ci]
| -rw-r--r--[-rwxr-xr-x] | msi/createmsi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py index 7c425cd..9b4e105 100755..100644 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -50,10 +50,10 @@ 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 (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x86.msm' + redist_glob = 'C:\\Program Files*\\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.') + sys.exit('Could not find unique MSM setup:' + '\n'.join(trials)) self.redist_path = trials[0] self.component_num = 0 self.feature_properties = { |