This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10686

packaging: rename run_pyoxidizer()
ClosedPublic

Authored by indygreg on May 6 2021, 8:00 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGdf1767fa822d: packaging: rename run_pyoxidizer()
Summary

I'm going to split this function up in a future commit and I'll
want the name "run_pyoxidizer()" for a lower-level function for
invoking pyoxidizer.

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.May 6 2021, 8:00 PM
baymax updated this revision to Diff 27757.May 7 2021, 11:30 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27794.May 10 2021, 11:38 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

mharbison72 accepted this revision.May 10 2021, 11:48 PM
This revision is now accepted and ready to land.May 10 2021, 11:48 PM
indygreg added a commit: rHGdf1767fa822d: packaging: rename run_pyoxidizer().May 15 2021, 7:24 PM
Closed by commit rHGdf1767fa822d: packaging: rename run_pyoxidizer() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27945

contrib/packaging/hgpackaging/inno.py

import subprocess import subprocess
import jinja2 import jinja2
from .py2exe import ( from .py2exe import (
build_py2exe, build_py2exe,
stage_install, stage_install,
) )
from .pyoxidizer import run_pyoxidizer from .pyoxidizer import create_pyoxidizer_install_layout
from .util import ( from .util import (
find_legacy_vc_runtime_files, find_legacy_vc_runtime_files,
normalize_windows_version, normalize_windows_version,
process_install_rules, process_install_rules,
read_version_py, read_version_py,
) )
EXTRA_PACKAGES = { EXTRA_PACKAGES = {
"""Build the Inno installer using PyOxidizer.""" """Build the Inno installer using PyOxidizer."""
if not iscc_exe.exists(): if not iscc_exe.exists():
raise Exception("%s does not exist" % iscc_exe) raise Exception("%s does not exist" % iscc_exe)
inno_build_dir = build_dir / ("inno-pyoxidizer-%s" % target_triple) inno_build_dir = build_dir / ("inno-pyoxidizer-%s" % target_triple)
staging_dir = inno_build_dir / "stage" staging_dir = inno_build_dir / "stage"
inno_build_dir.mkdir(parents=True, exist_ok=True) inno_build_dir.mkdir(parents=True, exist_ok=True)
run_pyoxidizer(source_dir, inno_build_dir, staging_dir, target_triple) create_pyoxidizer_install_layout(
source_dir, inno_build_dir, staging_dir, target_triple
)
process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir) process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)
build_installer( build_installer(
source_dir, source_dir,
inno_build_dir, inno_build_dir,
staging_dir, staging_dir,
iscc_exe, iscc_exe,

contrib/packaging/hgpackaging/pyoxidizer.py

""" """
subprocess.run( subprocess.run(
[sys.executable, str(source_dir / "setup.py"), "build_doc", "--html"], [sys.executable, str(source_dir / "setup.py"), "build_doc", "--html"],
cwd=str(source_dir), cwd=str(source_dir),
check=True, check=True,
) )
def run_pyoxidizer( def create_pyoxidizer_install_layout(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
out_dir: pathlib.Path, out_dir: pathlib.Path,
target_triple: str, target_triple: str,
): ):
"""Build Mercurial with PyOxidizer and copy additional files into place. """Build Mercurial with PyOxidizer and copy additional files into place.
After successful completion, ``out_dir`` contains files constituting a After successful completion, ``out_dir`` contains files constituting a

contrib/packaging/hgpackaging/wix.py

import uuid import uuid
import xml.dom.minidom import xml.dom.minidom
from .downloads import download_entry from .downloads import download_entry
from .py2exe import ( from .py2exe import (
build_py2exe, build_py2exe,
stage_install, stage_install,
) )
from .pyoxidizer import run_pyoxidizer from .pyoxidizer import create_pyoxidizer_install_layout
from .util import ( from .util import (
extract_zip_to_directory, extract_zip_to_directory,
normalize_windows_version, normalize_windows_version,
process_install_rules, process_install_rules,
sign_with_signtool, sign_with_signtool,
) )
"""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)
staging_dir = build_dir / "stage" staging_dir = build_dir / "stage"
arch = "x64" if "x86_64" in target_triple else "x86" arch = "x64" if "x86_64" in target_triple else "x86"
build_dir.mkdir(parents=True, exist_ok=True) build_dir.mkdir(parents=True, exist_ok=True)
run_pyoxidizer(source_dir, build_dir, staging_dir, target_triple) create_pyoxidizer_install_layout(
source_dir, build_dir, staging_dir, target_triple
)
# We also install some extra files. # We also install some extra files.
process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir) process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)
# And remove some files we don't want. # And remove some files we don't want.
for f in STAGING_REMOVE_FILES: for f in STAGING_REMOVE_FILES:
p = staging_dir / f p = staging_dir / f
if p.exists(): if p.exists():