# HG changeset patch # User Gregory Szorc # Date 2020-04-21 00:42:50 # Node ID 234882d178149fd3887b8abc45163a1025dade90 # Parent a5740490eb5f1cfe505eb6367729ebe7bc617f42 packaging: support building WiX installers with PyOxidizer We initially implemented PyOxidizer support for Inno installers. That did most of the heavy work of integrating PyOxidizer into the packaging system. Implementing WiX installer support was pretty straightforward. Aspects of this patch look very similar to Inno's. The main difference is the handling of the Visual C++ Redistributable Runtime files. The WiX installer was formerly using merge modules to install the VC++ 9.0 runtime because this feature is supported by the WiX installer (it isn't easily available to Inno installers). Our strategy for the runtime files is to install the vcruntime140.dll file next to hg.exe just like any other file. While we could leverage WiX's functionality for invoking a VCRedist installer, I don't want to deal with the complexity at this juncture. So, we let run_pyoxidizer() copy vcruntime140.dll into the staging directory (like it does for Inno) and our dynamic WiX XML generator picks it up as a regular file and installs it. We did, however, have to teach mercurial.wxs how to conditionally use the merge modules. But this was rather straightforward. Comparing the file layout of the WiX installers before and after: * Various lib/*.{pyd, dll} files no longer exist * python27.dll was replaced by python37.dll * vcruntime140.dll was added All these changes are expected due to the transition to Python 3 and to PyOxidizer, which embeded the .pyd and .dll files in hg.exe. Differential Revision: https://phab.mercurial-scm.org/D8477 diff --git a/contrib/packaging/hgpackaging/cli.py b/contrib/packaging/hgpackaging/cli.py --- a/contrib/packaging/hgpackaging/cli.py +++ b/contrib/packaging/hgpackaging/cli.py @@ -50,6 +50,7 @@ def build_inno(pyoxidizer_target=None, p def build_wix( name=None, + pyoxidizer_target=None, python=None, version=None, sign_sn=None, @@ -60,16 +61,29 @@ def build_wix( extra_wxs=None, extra_features=None, ): + if not pyoxidizer_target and not python: + raise Exception("--python required unless building with PyOxidizer") + + if python and not os.path.isabs(python): + raise Exception("--python arg must be an absolute path") + kwargs = { "source_dir": SOURCE_DIR, - "python_exe": pathlib.Path(python), "version": version, } - if not os.path.isabs(python): - raise Exception("--python arg must be an absolute path") + if pyoxidizer_target: + fn = wix.build_installer_pyoxidizer + kwargs["target_triple"] = pyoxidizer_target + else: + fn = wix.build_installer_py2exe + kwargs["python_exe"] = pathlib.Path(python) if extra_packages_script: + if pyoxidizer_target: + raise Exception( + "pyoxidizer does not support --extra-packages-script" + ) kwargs["extra_packages_script"] = extra_packages_script if extra_wxs: kwargs["extra_wxs"] = dict( @@ -87,7 +101,7 @@ def build_wix( "timestamp_url": sign_timestamp_url, } - wix.build_installer(**kwargs) + fn(**kwargs) def get_parser(): @@ -115,8 +129,11 @@ def get_parser(): ) sp.add_argument("--name", help="Application name", default="Mercurial") sp.add_argument( - "--python", help="Path to Python executable to use", required=True + "--pyoxidizer-target", + choices={"i686-pc-windows-msvc", "x86_64-pc-windows-msvc"}, + help="Build with PyOxidizer targeting this host triple", ) + sp.add_argument("--python", help="Path to Python executable to use") sp.add_argument( "--sign-sn", help="Subject name (or fragment thereof) of certificate " diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py --- a/contrib/packaging/hgpackaging/wix.py +++ b/contrib/packaging/hgpackaging/wix.py @@ -22,6 +22,7 @@ from .py2exe import ( build_py2exe, stage_install, ) +from .pyoxidizer import run_pyoxidizer from .util import ( extract_zip_to_directory, normalize_windows_version, @@ -284,7 +285,7 @@ def make_files_xml(staging_dir: pathlib. return doc.toprettyxml() -def build_installer( +def build_installer_py2exe( source_dir: pathlib.Path, python_exe: pathlib.Path, msi_name='mercurial', @@ -294,7 +295,7 @@ def build_installer( extra_features: typing.Optional[typing.List[str]] = None, signing_info: typing.Optional[typing.Dict[str, str]] = None, ): - """Build a WiX MSI installer. + """Build a WiX MSI installer using py2exe. ``source_dir`` is the path to the Mercurial source tree to use. ``arch`` is the target architecture. either ``x86`` or ``x64``. @@ -355,6 +356,50 @@ def build_installer( staging_dir, arch, version=version, + python2=True, + msi_name=msi_name, + extra_wxs=extra_wxs, + extra_features=extra_features, + signing_info=signing_info, + ) + + +def build_installer_pyoxidizer( + source_dir: pathlib.Path, + target_triple: str, + msi_name='mercurial', + version=None, + extra_wxs: typing.Optional[typing.Dict[str, str]] = None, + extra_features: typing.Optional[typing.List[str]] = None, + signing_info: typing.Optional[typing.Dict[str, str]] = None, +): + """Build a WiX MSI installer using PyOxidizer.""" + hg_build_dir = source_dir / "build" + build_dir = hg_build_dir / ("wix-%s" % target_triple) + staging_dir = build_dir / "stage" + + arch = "x64" if "x86_64" in target_triple else "x86" + + build_dir.mkdir(parents=True, exist_ok=True) + run_pyoxidizer(source_dir, build_dir, staging_dir, target_triple) + + # We also install some extra files. + process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir) + + # And remove some files we don't want. + for f in STAGING_REMOVE_FILES: + p = staging_dir / f + if p.exists(): + print('removing %s' % p) + p.unlink() + + return run_wix_packaging( + source_dir, + build_dir, + staging_dir, + arch, + version, + python2=False, msi_name=msi_name, extra_wxs=extra_wxs, extra_features=extra_features, @@ -368,6 +413,7 @@ def run_wix_packaging( staging_dir: pathlib.Path, arch: str, version: str, + python2: bool, msi_name: typing.Optional[str] = "mercurial", extra_wxs: typing.Optional[typing.Dict[str, str]] = None, extra_features: typing.Optional[typing.List[str]] = None, @@ -406,7 +452,8 @@ def run_wix_packaging( if not wix_path.exists(): extract_zip_to_directory(wix_pkg, wix_path) - ensure_vc90_merge_modules(build_dir) + if python2: + ensure_vc90_merge_modules(build_dir) source_build_rel = pathlib.Path(os.path.relpath(source_dir, build_dir)) @@ -425,7 +472,16 @@ def run_wix_packaging( source = wix_dir / 'mercurial.wxs' defines['Version'] = version defines['Comments'] = 'Installs Mercurial version %s' % version - defines['VCRedistSrcDir'] = str(build_dir) + + if python2: + defines["PythonVersion"] = "2" + defines['VCRedistSrcDir'] = str(build_dir) + else: + defines["PythonVersion"] = "3" + + if (staging_dir / "lib").exists(): + defines["MercurialHasLib"] = "1" + if extra_features: assert all(';' not in f for f in extra_features) defines['MercurialExtraFeatures'] = ';'.join(extra_features) diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs --- a/contrib/packaging/wix/mercurial.wxs +++ b/contrib/packaging/wix/mercurial.wxs @@ -79,16 +79,21 @@ - - - - - - + + + + + + + + + @@ -101,10 +106,14 @@ - + + + - - + + + +