contrib/plan9/proto
author Gregory Szorc <gregory.szorc@gmail.com>
Thu, 06 May 2021 16:11:13 -0700
changeset 47221 73f1a10320d1
parent 16489 cf137319c6cd
permissions -rw-r--r--
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

lib	- sys sys
	mercurial	- sys sys
		hgrc.d	- sys sys
			9diff.rc	- sys sys
			factotum.rc	- sys sys
rc	- sys sys
	bin	- sys sys
		9diff	- sys sys
		hg	- sys sys
sys	- sys sys
	lib	- sys sys
		python	- sys sys
			lib	- sys sys
				python2.5	- sys sys
					site-packages	- sys sys
						hgext	- sys sys
							+	- sys sys
						mercurial	- sys sys
							+	- sys sys
						mercurial-VERSION-py2.5.egg-info	- sys sys
	src	- sys sys
		cmd	- sys sys
			hg	- sys sys
				+	- sys sys