This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11093

packaging: add command line flag to add extra vars to pyoxidizer
ClosedPublic

Authored by durin42 on Jul 14 2021, 3:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbe37bb8d0c7c: packaging: add command line flag to add extra vars to pyoxidizer
Summary

This felt simpler than the previous incarnation of injecting
content into the WiX build. I decided the easiest way to pass
an arbitrary map into the process was some json - I may regret this,
but time will tell on that.

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

durin42 created this revision.Jul 14 2021, 3:26 PM
pulkit accepted this revision.Jul 18 2021, 5:33 AM
This revision is now accepted and ready to land.Jul 18 2021, 5:33 AM

Revision Contents
Changeset List

Diff 29361

contrib/packaging/hgpackaging/cli.py

version=None, version=None,
sign_sn=None, sign_sn=None,
sign_cert=None, sign_cert=None,
sign_password=None, sign_password=None,
sign_timestamp_url=None, sign_timestamp_url=None,
extra_packages_script=None, extra_packages_script=None,
extra_wxs=None, extra_wxs=None,
extra_features=None, extra_features=None,
extra_pyoxidizer_vars=None,
): ):
if not pyoxidizer_target and not python: if not pyoxidizer_target and not python:
raise Exception("--python required unless building with PyOxidizer") raise Exception("--python required unless building with PyOxidizer")
if python and not os.path.isabs(python): if python and not os.path.isabs(python):
raise Exception("--python arg must be an absolute path") raise Exception("--python arg must be an absolute path")
kwargs = { kwargs = {
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) fn(**kwargs, extra_pyoxidizer_vars=extra_pyoxidizer_vars)
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")
) )
sp.add_argument( sp.add_argument(
"--extra-features", "--extra-features",
help=( help=(
"CSV of extra feature names to include " "CSV of extra feature names to include "
"in the installer from the extra wxs files" "in the installer from the extra wxs files"
), ),
) )
sp.add_argument(
"--extra-pyoxidizer-vars",
help="json map of extra variables to pass to pyoxidizer",
)
sp.set_defaults(func=build_wix) sp.set_defaults(func=build_wix)
return parser return parser
def main(): def main():
parser = get_parser() parser = get_parser()
args = parser.parse_args() args = parser.parse_args()

contrib/packaging/hgpackaging/wix.py

# wix.py - WiX installer functionality # wix.py - WiX installer functionality
# #
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native. # no-check-code because Python 3 native.
import collections import collections
import json
import os import os
import pathlib import pathlib
import re import re
import shutil import shutil
import subprocess import subprocess
import typing import typing
import uuid import uuid
import xml.dom.minidom import xml.dom.minidom
def build_installer_pyoxidizer( def build_installer_pyoxidizer(
source_dir: pathlib.Path, source_dir: pathlib.Path,
target_triple: str, target_triple: str,
msi_name='mercurial', msi_name='mercurial',
version=None, version=None,
extra_wxs: typing.Optional[typing.Dict[str, str]] = None, extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
extra_features: typing.Optional[typing.List[str]] = None, extra_features: typing.Optional[typing.List[str]] = None,
signing_info: typing.Optional[typing.Dict[str, str]] = None, signing_info: typing.Optional[typing.Dict[str, str]] = None,
extra_pyoxidizer_vars=None,
): ):
"""Build a WiX MSI installer using PyOxidizer.""" """Build a WiX MSI installer using PyOxidizer."""
hg_build_dir = source_dir / "build" hg_build_dir = source_dir / "build"
build_dir = hg_build_dir / ("wix-%s" % target_triple) build_dir = hg_build_dir / ("wix-%s" % target_triple)
build_dir.mkdir(parents=True, exist_ok=True) build_dir.mkdir(parents=True, exist_ok=True)
# Need to ensure docs HTML is built because this isn't done as part of # Need to ensure docs HTML is built because this isn't done as part of
build_vars["SIGNING_PFX_PATH"] = signing_info["cert_path"] build_vars["SIGNING_PFX_PATH"] = signing_info["cert_path"]
if signing_info["cert_password"]: if signing_info["cert_password"]:
build_vars["SIGNING_PFX_PASSWORD"] = signing_info["cert_password"] build_vars["SIGNING_PFX_PASSWORD"] = signing_info["cert_password"]
if signing_info["subject_name"]: if signing_info["subject_name"]:
build_vars["SIGNING_SUBJECT_NAME"] = signing_info["subject_name"] build_vars["SIGNING_SUBJECT_NAME"] = signing_info["subject_name"]
if signing_info["timestamp_url"]: if signing_info["timestamp_url"]:
build_vars["TIME_STAMP_SERVER_URL"] = signing_info["timestamp_url"] build_vars["TIME_STAMP_SERVER_URL"] = signing_info["timestamp_url"]
if extra_pyoxidizer_vars:
build_vars.update(json.loads(extra_pyoxidizer_vars))
if extra_wxs: if extra_wxs:
raise Exception( raise Exception(
"support for extra .wxs files has been temporarily dropped" "support for extra .wxs files has been temporarily dropped"
) )
out_dir = run_pyoxidizer( out_dir = run_pyoxidizer(
source_dir, source_dir,
build_dir, build_dir,