diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
| commit | eaf6343c065842b9719793066e765b2e5f1c2f3b (patch) | |
| tree | 1bfeac5297ba489721e704e63c28f33d0fb98990 /msi/createmsi.py | |
| parent | 87aa98c1787d800145853a8e84654e4c54ee1078 (diff) | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-lang-enum.zip meson-lang-enum.tar.gz meson-lang-enum.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum
Diffstat (limited to 'msi/createmsi.py')
| -rw-r--r-- | msi/createmsi.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py index f80d1dc..eca4493 100644 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -13,10 +13,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + ''' - This script is for generating MSI packages - for Windows users. +This script is for generating MSI packages +for Windows users. ''' + import subprocess import shutil import uuid @@ -78,12 +80,8 @@ class PackageGenerator: self.bytesize = 32 if '32' in platform.architecture()[0] else 64 self.final_output = 'meson-{}-{}.msi'.format(self.version, self.bytesize) self.staging_dirs = ['dist', 'dist2'] - if self.bytesize == 64: - self.progfile_dir = 'ProgramFiles64Folder' - 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\\2019\\Community\\VC\\Redist\\MSVC\\*\\MergeModules\\Microsoft_VC142_CRT_x86.msm' + self.progfile_dir = 'ProgramFiles64Folder' + redist_glob = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Redist\\MSVC\\v*\\MergeModules\\Microsoft_VC142_CRT_x64.msm' trials = glob(redist_glob) if len(trials) != 1: sys.exit('Could not find unique MSM setup:' + '\n'.join(trials)) |