This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11355

packaging: pass extra_pyoxidizer_vars only to pyoxidizer
ClosedPublic

Authored by indygreg on Aug 27 2021, 1:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG39ab4c2f38b4: packaging: pass extra_pyoxidizer_vars only to pyoxidizer
Summary

Before, we would attempt to call a function (build_installer_py2exe)
that didn't accept this keyword argument. This was preventing the
building of py2exe installers.

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.Aug 27 2021, 1:37 AM
Alphare accepted this revision.Aug 27 2021, 4:33 AM
This revision is now accepted and ready to land.Aug 27 2021, 4:33 AM

Revision Contents
Changeset List

Diff 30077

contrib/packaging/hgpackaging/cli.py

kwargs = { kwargs = {
"source_dir": SOURCE_DIR, "source_dir": SOURCE_DIR,
"version": version, "version": version,
} }
if pyoxidizer_target: if pyoxidizer_target:
fn = wix.build_installer_pyoxidizer fn = wix.build_installer_pyoxidizer
kwargs["target_triple"] = pyoxidizer_target kwargs["target_triple"] = pyoxidizer_target
kwargs["extra_pyoxidizer_vars"] = extra_pyoxidizer_vars
else: else:
fn = wix.build_installer_py2exe fn = wix.build_installer_py2exe
kwargs["python_exe"] = pathlib.Path(python) kwargs["python_exe"] = pathlib.Path(python)
if extra_packages_script: if extra_packages_script:
if pyoxidizer_target: if pyoxidizer_target:
raise Exception( raise Exception(
"pyoxidizer does not support --extra-packages-script" "pyoxidizer does not support --extra-packages-script"
kwargs["signing_info"] = { kwargs["signing_info"] = {
"name": name, "name": name,
"subject_name": sign_sn, "subject_name": sign_sn,
"cert_path": sign_cert, "cert_path": sign_cert,
"cert_password": sign_password, "cert_password": sign_password,
"timestamp_url": sign_timestamp_url, "timestamp_url": sign_timestamp_url,
} }
fn(**kwargs, extra_pyoxidizer_vars=extra_pyoxidizer_vars) fn(**kwargs)
def get_parser(): def get_parser():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers() subparsers = parser.add_subparsers()
sp = subparsers.add_parser("inno", help="Build Inno Setup installer") sp = subparsers.add_parser("inno", help="Build Inno Setup installer")