This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8479

packaging: add -python2 to Windows installer filenames
ClosedPublic

Authored by indygreg on Apr 23 2020, 11:28 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9ade217b550d: packaging: add -python2 to Windows installer filenames
rHG03bb3ce40209: packaging: add -python2 to Windows installer filenames
Summary

We just taught the Windows installers to produce Python 3 variants
built with PyOxidizer.

Our plan is to publish both Python 2 and Python 3 versions of the
installers for Mercurial 5.4.

This commit teaches the Inno and WiX installers to add an optional
string suffix to the installer name. On Python 2, that suffix is
"-python2." We reserve the existing name for the Python 3 installers,
which we want to make the default.

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.Apr 23 2020, 11:28 PM
indygreg added a commit: rHG03bb3ce40209: packaging: add -python2 to Windows installer filenames.Apr 30 2020, 1:53 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG03bb3ce40209: packaging: add -python2 to Windows installer filenames (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21247

contrib/automation/hgautomation/windows.py

WHEEL_FILENAME_PYTHON27_X86 = 'mercurial-{version}-cp27-cp27m-win32.whl' WHEEL_FILENAME_PYTHON27_X86 = 'mercurial-{version}-cp27-cp27m-win32.whl'
WHEEL_FILENAME_PYTHON27_X64 = 'mercurial-{version}-cp27-cp27m-win_amd64.whl' WHEEL_FILENAME_PYTHON27_X64 = 'mercurial-{version}-cp27-cp27m-win_amd64.whl'
WHEEL_FILENAME_PYTHON37_X86 = 'mercurial-{version}-cp37-cp37m-win32.whl' WHEEL_FILENAME_PYTHON37_X86 = 'mercurial-{version}-cp37-cp37m-win32.whl'
WHEEL_FILENAME_PYTHON37_X64 = 'mercurial-{version}-cp37-cp37m-win_amd64.whl' WHEEL_FILENAME_PYTHON37_X64 = 'mercurial-{version}-cp37-cp37m-win_amd64.whl'
WHEEL_FILENAME_PYTHON38_X86 = 'mercurial-{version}-cp38-cp38-win32.whl' WHEEL_FILENAME_PYTHON38_X86 = 'mercurial-{version}-cp38-cp38-win32.whl'
WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl' WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl'
X86_EXE_FILENAME = 'Mercurial-{version}.exe' X86_EXE_FILENAME = 'Mercurial-{version}-x86-python2.exe'
X64_EXE_FILENAME = 'Mercurial-{version}-x64.exe' X64_EXE_FILENAME = 'Mercurial-{version}-x64-python2.exe'
X86_MSI_FILENAME = 'mercurial-{version}-x86.msi' X86_MSI_FILENAME = 'mercurial-{version}-x86-python2.msi'
X64_MSI_FILENAME = 'mercurial-{version}-x64.msi' X64_MSI_FILENAME = 'mercurial-{version}-x64-python2.msi'
MERCURIAL_SCM_BASE_URL = 'https://mercurial-scm.org/release/windows' MERCURIAL_SCM_BASE_URL = 'https://mercurial-scm.org/release/windows'
X86_USER_AGENT_PATTERN = '.*Windows.*' X86_USER_AGENT_PATTERN = '.*Windows.*'
X64_USER_AGENT_PATTERN = '.*Windows.*(WOW|x)64.*' X64_USER_AGENT_PATTERN = '.*Windows.*(WOW|x)64.*'
X86_EXE_DESCRIPTION = ( X86_EXE_DESCRIPTION = (
'Mercurial {version} Inno Setup installer - x86 Windows ' 'Mercurial {version} Inno Setup installer - x86 Windows '

contrib/packaging/hgpackaging/inno.py

build_installer( build_installer(
source_dir, source_dir,
inno_build_dir, inno_build_dir,
staging_dir, staging_dir,
iscc_exe, iscc_exe,
version, version,
arch="x64" if vc_x64 else None, arch="x64" if vc_x64 else None,
suffix="-python2",
) )
def build_with_pyoxidizer( def build_with_pyoxidizer(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
target_triple: str, target_triple: str,
iscc_exe: pathlib.Path, iscc_exe: pathlib.Path,
def build_installer( def build_installer(
source_dir: pathlib.Path, source_dir: pathlib.Path,
inno_build_dir: pathlib.Path, inno_build_dir: pathlib.Path,
staging_dir: pathlib.Path, staging_dir: pathlib.Path,
iscc_exe: pathlib.Path, iscc_exe: pathlib.Path,
version, version,
arch=None, arch=None,
suffix="",
): ):
"""Build an Inno installer from staged Mercurial files. """Build an Inno installer from staged Mercurial files.
This function is agnostic about how to build Mercurial. It just This function is agnostic about how to build Mercurial. It just
cares that Mercurial files are in ``staging_dir``. cares that Mercurial files are in ``staging_dir``.
""" """
inno_source_dir = source_dir / "contrib" / "packaging" / "inno" inno_source_dir = source_dir / "contrib" / "packaging" / "inno"
shutil.copyfile( shutil.copyfile(
source_dir / 'contrib' / 'win32' / p, inno_build_dir / p source_dir / 'contrib' / 'win32' / p, inno_build_dir / p
) )
args = [str(iscc_exe)] args = [str(iscc_exe)]
if arch: if arch:
args.append('/dARCH=%s' % arch) args.append('/dARCH=%s' % arch)
args.append('/dSUFFIX=-%s%s' % (arch, suffix))
else:
args.append('/dSUFFIX=-x86%s' % suffix)
if not version: if not version:
version = read_version_py(source_dir) version = read_version_py(source_dir)
args.append('/dVERSION=%s' % version) args.append('/dVERSION=%s' % version)
args.append('/dQUAD_VERSION=%s' % normalize_windows_version(version)) args.append('/dQUAD_VERSION=%s' % normalize_windows_version(version))
args.append('/Odist') args.append('/Odist')
args.append(str(inno_build_dir / 'mercurial.iss')) args.append(str(inno_build_dir / 'mercurial.iss'))
subprocess.run(args, cwd=str(source_dir), check=True) subprocess.run(args, cwd=str(source_dir), check=True)

contrib/packaging/hgpackaging/wix.py

return run_wix_packaging( return run_wix_packaging(
source_dir, source_dir,
build_dir, build_dir,
staging_dir, staging_dir,
arch, arch,
version=version, version=version,
python2=True, python2=True,
msi_name=msi_name, msi_name=msi_name,
suffix="-python2",
extra_wxs=extra_wxs, extra_wxs=extra_wxs,
extra_features=extra_features, extra_features=extra_features,
signing_info=signing_info, signing_info=signing_info,
) )
def build_installer_pyoxidizer( def build_installer_pyoxidizer(
source_dir: pathlib.Path, source_dir: pathlib.Path,
def run_wix_packaging( def run_wix_packaging(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
staging_dir: pathlib.Path, staging_dir: pathlib.Path,
arch: str, arch: str,
version: str, version: str,
python2: bool, python2: bool,
msi_name: typing.Optional[str] = "mercurial", msi_name: typing.Optional[str] = "mercurial",
suffix: str = "",
extra_wxs: typing.Optional[typing.Dict[str, str]] = None, extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
extra_features: typing.Optional[typing.List[str]] = None, extra_features: typing.Optional[typing.List[str]] = None,
signing_info: typing.Optional[typing.Dict[str, str]] = None, signing_info: typing.Optional[typing.Dict[str, str]] = None,
): ):
"""Invokes WiX to package up a built Mercurial. """Invokes WiX to package up a built Mercurial.
``signing_info`` is a dict defining properties to facilitate signing the ``signing_info`` is a dict defining properties to facilitate signing the
installer. Recognized keys include ``name``, ``subject_name``, installer. Recognized keys include ``name``, ``subject_name``,
if extra_features: if extra_features:
assert all(';' not in f for f in extra_features) assert all(';' not in f for f in extra_features)
defines['MercurialExtraFeatures'] = ';'.join(extra_features) defines['MercurialExtraFeatures'] = ';'.join(extra_features)
run_candle(wix_path, build_dir, source, source_build_rel, defines=defines) run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
msi_path = ( msi_path = (
source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, orig_version, arch)) source_dir
/ 'dist'
/ ('%s-%s-%s%s.msi' % (msi_name, orig_version, arch, suffix))
) )
args = [ args = [
str(wix_path / 'light.exe'), str(wix_path / 'light.exe'),
'-nologo', '-nologo',
'-ext', '-ext',
'WixUIExtension', 'WixUIExtension',
'-sw1076', '-sw1076',

contrib/packaging/inno/mercurial.iss

; Script generated by the Inno Setup Script Wizard. ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#ifndef ARCH #ifndef ARCH
#define ARCH = "x86" #define ARCH = "x86"
#endif #endif
[Setup] [Setup]
AppCopyright=Copyright 2005-2020 Matt Mackall and others AppCopyright=Copyright 2005-2020 Matt Mackall and others
AppName=Mercurial AppName=Mercurial
AppVersion={#VERSION} AppVersion={#VERSION}
OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX}
#if ARCH == "x64" #if ARCH == "x64"
AppVerName=Mercurial {#VERSION} (64-bit) AppVerName=Mercurial {#VERSION} (64-bit)
OutputBaseFilename=Mercurial-{#VERSION}-x64
ArchitecturesAllowed=x64 ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64
#else #else
AppVerName=Mercurial {#VERSION} AppVerName=Mercurial {#VERSION}
OutputBaseFilename=Mercurial-{#VERSION}
#endif #endif
InfoAfterFile=../postinstall.txt InfoAfterFile=../postinstall.txt
LicenseFile=Copying.txt LicenseFile=Copying.txt
ShowLanguageDialog=yes ShowLanguageDialog=yes
AppPublisher=Matt Mackall and others AppPublisher=Matt Mackall and others
AppPublisherURL=https://mercurial-scm.org/ AppPublisherURL=https://mercurial-scm.org/
AppSupportURL=https://mercurial-scm.org/ AppSupportURL=https://mercurial-scm.org/
AppUpdatesURL=https://mercurial-scm.org/ AppUpdatesURL=https://mercurial-scm.org/