( )⚙ D10687 packaging: extract invocation of pyoxidizer to own function

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10687

packaging: extract invocation of pyoxidizer to own function
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGd09b36f69180: packaging: extract invocation of pyoxidizer to own function
Summary

I'll be refactoring how the WiX installer creation calls into
pyoxidizer and will need a lower level function for facilitating
that.

The new run_pyoxidizer() builds our execution environment
(with gettext available) and invokes 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 27758.May 7 2021, 11:30 AM

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

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

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

mharbison72 accepted this revision.May 11 2021, 12:11 AM
mharbison72 added a subscriber: mharbison72.

This is interesting because the test-gendoc-* tests mostly fail on my Windows machines with py3 (but work with py2). The executable is /mingw/bin/msgfmt.exe, but it's been there forever and IDR where I got it. That's a strange place for executables, so I assume it's not from the mingw installers and that I just stuffed it there as a convenient way to get it on PATH. Installing various MSYS packages on the new CI system didn't install a msgfmt that hghave accepted. So then I installed https://github.com/vslavik/gettext-tools-windows/releases/download/v0.21-1/gettext-tools-windows-0.21-1.zip, and it failed the tests in a different way. The 0.14.4 version from SF doesn't seem to print a version number, so that's likely why hghave won't use it for tests.

This revision is now accepted and ready to land.May 11 2021, 12:11 AM

Revision Contents
Changeset List

Diff 27946

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 create_pyoxidizer_install_layout( def run_pyoxidizer(
source_dir: pathlib.Path, source_dir: pathlib.Path, build_dir: pathlib.Path, target_triple: str,
build_dir: pathlib.Path, ) -> pathlib.Path:
out_dir: pathlib.Path, """Run `pyoxidizer` in an environment with access to build dependencies.
target_triple: str,
): Returns the output directory that pyoxidizer would have used for build
"""Build Mercurial with PyOxidizer and copy additional files into place. artifacts. Actual build artifacts are likely in a sub-directory with the
name of the pyoxidizer build target that was built.
After successful completion, ``out_dir`` contains files constituting a
Mercurial install.
""" """
# We need to make gettext binaries available for compiling i18n files. # We need to make gettext binaries available for compiling i18n files.
gettext_pkg, gettext_entry = download_entry('gettext', build_dir) gettext_pkg, gettext_entry = download_entry('gettext', build_dir)
gettext_dep_pkg = download_entry('gettext-dep', build_dir)[0] gettext_dep_pkg = download_entry('gettext-dep', build_dir)[0]
gettext_root = build_dir / ('gettext-win-%s' % gettext_entry['version']) gettext_root = build_dir / ('gettext-win-%s' % gettext_entry['version'])
if not gettext_root.exists(): if not gettext_root.exists():
str(source_dir / "rust" / "hgcli"), str(source_dir / "rust" / "hgcli"),
"--release", "--release",
"--target-triple", "--target-triple",
target_triple, target_triple,
] ]
subprocess.run(args, env=env, check=True) subprocess.run(args, env=env, check=True)
return source_dir / "build" / "pyoxidizer" / target_triple / "release"
def create_pyoxidizer_install_layout(
source_dir: pathlib.Path,
build_dir: pathlib.Path,
out_dir: pathlib.Path,
target_triple: str,
):
"""Build Mercurial with PyOxidizer and copy additional files into place.
After successful completion, ``out_dir`` contains files constituting a
Mercurial install.
"""
run_pyoxidizer(source_dir, build_dir, target_triple)
if "windows" in target_triple: if "windows" in target_triple:
target = "app_windows" target = "app_windows"
else: else:
target = "app_posix" target = "app_posix"
build_dir = ( build_dir = (
source_dir / "build" / "pyoxidizer" / target_triple / "release" / target source_dir / "build" / "pyoxidizer" / target_triple / "release" / target
) )