Mercurial > hg
view contrib/packaging/hgpackaging/pyoxidizer.py @ 47210:73f1a10320d1
packaging: use PyOxidizer for producing WiX MSI installer
We recently taught our in-tree PyOxidizer configuration file to
produce MSI installers with WiX using PyOxidizer's built-in
support for doing so.
This commit changes our WiX + PyOxidizer installer generation
code to use this functionality.
After this change, all the Python packaging code is doing is the
following:
* Building HTML documentation
* Making gettext available to the build process.
* Munging CLI arguments to variables for the `pyoxidizer` execution.
* Invoking `pyoxidizer build`.
* Copying the produced `.msi` to the `dist/` directory.
Applying this stack on stable and rebuilding the 5.8 MSI installer
produced the following differences from the official 5.8 installer:
* .exe and .pyd files aren't byte identical (this is expected).
* Various .dist-info/ directories have different names due to older
versions of PyOxidizer being buggy and not properly normalizing
package names. (The new behavior is correct.)
* Various *.dist-info/RECORD files are different due to content
divergence of files (this is expected).
* The python38.dll differs due to newer PyOxidizer shipping a newer
version of Python 3.8.
* We now ship python3.dll because PyOxidizer now includes this file
by default.
* The vcruntime140.dll differs because newer PyOxidizer installs a newer
version. We also now ship a vcruntime140_1.dll because newer versions
of the redistributable ship 2 files now.
The WiX GUIDs and IDs of installed files have likely changed as a
result of PyOxidizer's different mechanism for generating those
identifiers. This means that an upgrade install of the MSI will
replace files instead of doing an incremental update. This is
likely harmless and we've incurred this kind of breakage before.
As far as I can tell, the new PyOxidizer-built MSI is functionally
equivalent to the old method. Once we drop support for Python 2.7
MSI installers, we can delete the WiX code from the repository.
This commit temporarily drops support for extra `.wxs` files. We
raise an exception instead of silently not using them, which I think
is appropriate. We should be able to add support back in by injecting
state into pyoxidizer.bzl via `--var`. I just didn't want to expend
cognitive load to think about the solution as part of this series.
Differential Revision: https://phab.mercurial-scm.org/D10688
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 06 May 2021 16:11:13 -0700 |
parents | d09b36f69180 |
children | 1e6cb23ce6da |
line wrap: on
line source
# pyoxidizer.py - Packaging support for PyOxidizer # # Copyright 2020 Gregory Szorc <gregory.szorc@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. # no-check-code because Python 3 native. import os import pathlib import shutil import subprocess import sys import typing from .downloads import download_entry from .util import ( extract_zip_to_directory, process_install_rules, find_vc_runtime_dll, ) STAGING_RULES_WINDOWS = [ ('contrib/bash_completion', 'contrib/'), ('contrib/hgk', 'contrib/hgk.tcl'), ('contrib/hgweb.fcgi', 'contrib/'), ('contrib/hgweb.wsgi', 'contrib/'), ('contrib/logo-droplets.svg', 'contrib/'), ('contrib/mercurial.el', 'contrib/'), ('contrib/mq.el', 'contrib/'), ('contrib/tcsh_completion', 'contrib/'), ('contrib/tcsh_completion_build.sh', 'contrib/'), ('contrib/vim/*', 'contrib/vim/'), ('contrib/win32/postinstall.txt', 'ReleaseNotes.txt'), ('contrib/win32/ReadMe.html', 'ReadMe.html'), ('contrib/xml.rnc', 'contrib/'), ('contrib/zsh_completion', 'contrib/'), ('doc/*.html', 'doc/'), ('doc/style.css', 'doc/'), ('COPYING', 'Copying.txt'), ] STAGING_RULES_APP = [ ('lib/mercurial/helptext/**/*.txt', 'helptext/'), ('lib/mercurial/defaultrc/*.rc', 'defaultrc/'), ('lib/mercurial/locale/**/*', 'locale/'), ('lib/mercurial/templates/**/*', 'templates/'), ] STAGING_EXCLUDES_WINDOWS = [ "doc/hg-ssh.8.html", ] def build_docs_html(source_dir: pathlib.Path): """Ensures HTML documentation is built. This will fail if docutils isn't available. (The HTML docs aren't built as part of `pip install` so we need to build them out of band.) """ subprocess.run( [sys.executable, str(source_dir / "setup.py"), "build_doc", "--html"], cwd=str(source_dir), check=True, ) def run_pyoxidizer( source_dir: pathlib.Path, build_dir: pathlib.Path, target_triple: str, build_vars: typing.Optional[typing.Dict[str, str]] = None, target: typing.Optional[str] = None, ) -> pathlib.Path: """Run `pyoxidizer` in an environment with access to build dependencies. Returns the output directory that pyoxidizer would have used for build artifacts. Actual build artifacts are likely in a sub-directory with the name of the pyoxidizer build target that was built. """ build_vars = build_vars or {} # We need to make gettext binaries available for compiling i18n files. gettext_pkg, gettext_entry = download_entry('gettext', build_dir) gettext_dep_pkg = download_entry('gettext-dep', build_dir)[0] gettext_root = build_dir / ('gettext-win-%s' % gettext_entry['version']) if not gettext_root.exists(): extract_zip_to_directory(gettext_pkg, gettext_root) extract_zip_to_directory(gettext_dep_pkg, gettext_root) env = dict(os.environ) env["PATH"] = "%s%s%s" % ( env["PATH"], os.pathsep, str(gettext_root / "bin"), ) args = [ "pyoxidizer", "build", "--path", str(source_dir / "rust" / "hgcli"), "--release", "--target-triple", target_triple, ] for k, v in sorted(build_vars.items()): args.extend(["--var", k, v]) if target: args.append(target) 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: target = "app_windows" else: target = "app_posix" build_dir = ( source_dir / "build" / "pyoxidizer" / target_triple / "release" / target ) if out_dir.exists(): print("purging %s" % out_dir) shutil.rmtree(out_dir) # Now assemble all the files from PyOxidizer into the staging directory. shutil.copytree(build_dir, out_dir) # Move some of those files around. We can get rid of this once Mercurial # is taught to use the importlib APIs for reading resources. process_install_rules(STAGING_RULES_APP, build_dir, out_dir) build_docs_html(source_dir) if "windows" in target_triple: process_install_rules(STAGING_RULES_WINDOWS, source_dir, out_dir) # Write out a default editor.rc file to configure notepad as the # default editor. os.makedirs(out_dir / "defaultrc", exist_ok=True) with (out_dir / "defaultrc" / "editor.rc").open( "w", encoding="utf-8" ) as fh: fh.write("[ui]\neditor = notepad\n") for f in STAGING_EXCLUDES_WINDOWS: p = out_dir / f if p.exists(): print("removing %s" % p) p.unlink() # Add vcruntimeXXX.dll next to executable. vc_runtime_dll = find_vc_runtime_dll(x64="x86_64" in target_triple) shutil.copy(vc_runtime_dll, out_dir / vc_runtime_dll.name)