--- a/contrib/packaging/hgpackaging/wix.py Thu Apr 23 17:24:37 2020 -0700
+++ b/contrib/packaging/hgpackaging/wix.py Thu Apr 23 18:48:36 2020 -0700
@@ -358,6 +358,7 @@
version=version,
python2=True,
msi_name=msi_name,
+ suffix="-python2",
extra_wxs=extra_wxs,
extra_features=extra_features,
signing_info=signing_info,
@@ -415,6 +416,7 @@
version: str,
python2: bool,
msi_name: typing.Optional[str] = "mercurial",
+ suffix: str = "",
extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
extra_features: typing.Optional[typing.List[str]] = None,
signing_info: typing.Optional[typing.Dict[str, str]] = None,
@@ -489,7 +491,9 @@
run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
msi_path = (
- source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, orig_version, arch))
+ source_dir
+ / 'dist'
+ / ('%s-%s-%s%s.msi' % (msi_name, orig_version, arch, suffix))
)
args = [