wix: use original version string for MSI filename stable
authorGregory Szorc <gregory.szorc@gmail.com>
Fri, 24 Jan 2020 20:27:59 -0800
branchstable
changeset 44173 62111bc5ff87
parent 44172 2251b6cde170
child 44208 9e367157a990
wix: use original version string for MSI filename Version string normalization is mostly to placate MSI requirements. I think it makes sense to use the original version string in filenames. Since we can have distinct versions normalizing to the same MSI version string, this will allow us to distinguish between different actual version strings based on the filename. Differential Revision: https://phab.mercurial-scm.org/D8005
contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py	Fri Jan 24 20:24:29 2020 -0800
+++ b/contrib/packaging/hgpackaging/wix.py	Fri Jan 24 20:27:59 2020 -0800
@@ -475,7 +475,7 @@
     run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
 
     msi_path = (
-        source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, version, arch))
+        source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, orig_version, arch))
     )
 
     args = [