diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-28 13:02:56 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-28 22:41:41 +0200 |
| commit | 5e95f137376088d42b5a8a5df01438049749774c (patch) | |
| tree | cb1abbb9f87ae19e72f9feafc908d4035ae436d5 /packaging | |
| parent | b86ef3f85020eb8ed0e464a7653fa9e57cd527c2 (diff) | |
| download | meson-5e95f137376088d42b5a8a5df01438049749774c.tar.gz | |
Remove remnants of 32 bit support. [skip ci]
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/createmsi.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/packaging/createmsi.py b/packaging/createmsi.py index e6c47f4e5..214fc4d4f 100644 --- a/packaging/createmsi.py +++ b/packaging/createmsi.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2017 The Meson development team +# Copyright 2017-2021 The Meson development team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import uuid import sys import os from glob import glob -import platform import xml.etree.ElementTree as ET sys.path.append(os.getcwd()) @@ -77,8 +76,7 @@ class PackageGenerator: self.update_guid = '141527EE-E28A-4D14-97A4-92E6075D28B2' self.main_xml = 'meson.wxs' self.main_o = 'meson.wixobj' - self.bytesize = 32 if '32' in platform.architecture()[0] else 64 - self.final_output = 'meson-{}-{}.msi'.format(self.version, self.bytesize) + self.final_output = 'meson-{}-64.msi'.format(self.version) self.staging_dirs = ['dist', 'dist2'] 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' @@ -209,8 +207,7 @@ class PackageGenerator: ET.SubElement(product, 'MajorUpgrade', {'DowngradeErrorMessage': 'A newer version of Meson is already installed.'}) - if self.bytesize == 64: - package.set('Platform', 'x64') + package.set('Platform', 'x64') ET.SubElement(product, 'Media', { 'Id': '1', 'Cabinet': 'meson.cab', @@ -295,8 +292,7 @@ class PackageGenerator: 'Guid': gen_guid(), }) self.feature_components[staging_dir].append(component_id) - if self.bytesize == 64: - comp_xml_node.set('Win64', 'yes') + comp_xml_node.set('Win64', 'yes') if self.component_num == 0: ET.SubElement(comp_xml_node, 'Environment', { 'Id': 'Environment', |