aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-07-18 14:44:42 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-07-18 14:44:42 +0300
commit2077b434dcf39e121e3beb9a0a6c29044f205162 (patch)
treea864df30de2ede3ce68c9eae4374f7cde57e9c89
parent799b96f75337d2e02b29af0ac54ed5f599b2b06e (diff)
downloadmeson-msifixpy39.zip
meson-msifixpy39.tar.gz
meson-msifixpy39.tar.bz2
Delete extra data dirs that cause problems for WiX.msifixpy39
-rwxr-xr-xpackaging/createmsi.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/packaging/createmsi.py b/packaging/createmsi.py
index fa1e644..c55688a 100755
--- a/packaging/createmsi.py
+++ b/packaging/createmsi.py
@@ -176,6 +176,7 @@ class PackageGenerator:
pyinst_cmd += ['meson.py']
subprocess.check_call(pyinst_cmd)
shutil.move(pyinstaller_tmpdir + '/meson', main_stage)
+ self.del_infodirs(main_stage)
if not os.path.exists(os.path.join(main_stage, 'meson.exe')):
sys.exit('Meson exe missing from staging dir.')
os.mkdir(ninja_stage)
@@ -183,6 +184,14 @@ class PackageGenerator:
if not os.path.exists(os.path.join(ninja_stage, 'ninja.exe')):
sys.exit('Ninja exe missing from staging dir.')
+ def del_infodirs(self, dirname):
+ # Starting with 3.9.something there are some
+ # extra metadatadirs that have a hyphen in their
+ # file names. This is a forbidden character in WiX
+ # filenames so delete them.
+ for d in glob(os.path.join(dirname, '*-info')):
+ shutil.rmtree(d)
+
def generate_files(self):
'''
Generate package files for MSI installer package