This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8068

packaging: make the path to Win32 requirements absolute when building WiX
ClosedPublic

Authored by mharbison72 on Feb 3 2020, 8:21 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG847e582f3cc9: packaging: make the path to Win32 requirements absolute when building WiX
Summary

Otherwise this broke automation when not launched from contrib/packaging.

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

mharbison72 created this revision.Feb 3 2020, 8:21 PM
indygreg accepted this revision.Feb 3 2020, 10:10 PM
This revision is now accepted and ready to land.Feb 3 2020, 10:10 PM

Revision Contents
Changeset List

Diff 19865

contrib/packaging/hgpackaging/wix.py

the build. These must match Feature names in one of the wxs scripts. the build. These must match Feature names in one of the wxs scripts.
""" """
arch = 'x64' if r'\x64' in os.environ.get('LIB', '') else 'x86' arch = 'x64' if r'\x64' in os.environ.get('LIB', '') else 'x86'
hg_build_dir = source_dir / 'build' hg_build_dir = source_dir / 'build'
dist_dir = source_dir / 'dist' dist_dir = source_dir / 'dist'
wix_dir = source_dir / 'contrib' / 'packaging' / 'wix' wix_dir = source_dir / 'contrib' / 'packaging' / 'wix'
requirements_txt = 'requirements_win32.txt' requirements_txt = (
source_dir / 'contrib' / 'packaging' / 'requirements_win32.txt'
)
build_py2exe( build_py2exe(
source_dir, source_dir,
hg_build_dir, hg_build_dir,
python_exe, python_exe,
'wix', 'wix',
requirements_txt, requirements_txt,
extra_packages=EXTRA_PACKAGES, extra_packages=EXTRA_PACKAGES,