Patchwork D8005: wix: use original version string for MSI filename

login
register
mail settings
Submitter phabricator
Date Jan. 25, 2020, 4:34 a.m.
Message ID <differential-rev-PHID-DREV-efb6ob5bklfmlc3dnkah-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44653/
State Superseded
Headers show

Comments

phabricator - Jan. 25, 2020, 4:34 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D8005

AFFECTED FILES
  contrib/packaging/hgpackaging/wix.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -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 = [