This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8004

wix: always normalize version string
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2251b6cde170: wix: always normalize version string
Summary

Before, it was possible to pass in a custom version string
which would not be valid in MSI. So we always normalize the
version string.

While we're here, also print when we normalize the version string,
for better visibility.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

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

Revision Contents
Changeset List

Diff 19610

contrib/packaging/hgpackaging/wix.py

hg_build_dir, hg_build_dir,
python_exe, python_exe,
'wix', 'wix',
requirements_txt, requirements_txt,
extra_packages=EXTRA_PACKAGES, extra_packages=EXTRA_PACKAGES,
extra_packages_script=extra_packages_script, extra_packages_script=extra_packages_script,
) )
version = version or normalize_version(find_version(source_dir)) orig_version = version or find_version(source_dir)
version = normalize_version(orig_version)
print('using version string: %s' % version) print('using version string: %s' % version)
if version != orig_version:
print('(normalized from: %s)' % orig_version)
if post_build_fn: if post_build_fn:
post_build_fn(source_dir, hg_build_dir, dist_dir, version) post_build_fn(source_dir, hg_build_dir, dist_dir, version)
build_dir = hg_build_dir / ('wix-%s' % arch) build_dir = hg_build_dir / ('wix-%s' % arch)
staging_dir = build_dir / 'stage' staging_dir = build_dir / 'stage'
build_dir.mkdir(exist_ok=True) build_dir.mkdir(exist_ok=True)