This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8005

wix: use original version string for MSI filename
ClosedPublic

Authored by indygreg on Jan 24 2020, 11:34 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG62111bc5ff87: wix: use original version string for MSI filename
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.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Jan 24 2020, 11:34 PM
pulkit accepted this revision.Jan 25 2020, 6:16 PM
This revision is now accepted and ready to land.Jan 25 2020, 6:16 PM
indygreg added a commit: rHG62111bc5ff87: wix: use original version string for MSI filename.Jan 25 2020, 7:02 PM
Closed by commit rHG62111bc5ff87: wix: use original version string for MSI filename (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19597

contrib/packaging/hgpackaging/wix.py

defines['VCRedistSrcDir'] = str(hg_build_dir) defines['VCRedistSrcDir'] = str(hg_build_dir)
if extra_features: if extra_features:
assert all(';' not in f for f in extra_features) assert all(';' not in f for f in extra_features)
defines['MercurialExtraFeatures'] = ';'.join(extra_features) defines['MercurialExtraFeatures'] = ';'.join(extra_features)
run_candle(wix_path, build_dir, source, source_build_rel, defines=defines) run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
msi_path = ( 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 = [ args = [
str(wix_path / 'light.exe'), str(wix_path / 'light.exe'),
'-nologo', '-nologo',
'-ext', '-ext',
'WixUIExtension', 'WixUIExtension',
'-sw1076', '-sw1076',