We want to make the logic for producing the installer agnostic about
how Mercurial is built to allow for alternate build methods (like
PyOxidizer).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/packaging/hgpackaging/inno.py (32 lines) |
| for finding the Python 2.7 toolchain. So, we require the environment | for finding the Python 2.7 toolchain. So, we require the environment | ||||
| to already be configured with an active toolchain. | to already be configured with an active toolchain. | ||||
| """ | """ | ||||
| if not iscc_exe.exists(): | if not iscc_exe.exists(): | ||||
| raise Exception('%s does not exist' % iscc_exe) | raise Exception('%s does not exist' % iscc_exe) | ||||
| vc_x64 = r'\x64' in os.environ.get('LIB', '') | vc_x64 = r'\x64' in os.environ.get('LIB', '') | ||||
| arch = 'x64' if vc_x64 else 'x86' | arch = 'x64' if vc_x64 else 'x86' | ||||
| inno_source_dir = source_dir / 'contrib' / 'packaging' / 'inno' | inno_build_dir = build_dir / ('inno-py2exe-%s' % arch) | ||||
| inno_build_dir = build_dir / ('inno-%s' % arch) | |||||
| staging_dir = inno_build_dir / 'stage' | staging_dir = inno_build_dir / 'stage' | ||||
| requirements_txt = ( | requirements_txt = ( | ||||
| source_dir / 'contrib' / 'packaging' / 'requirements_win32.txt' | source_dir / 'contrib' / 'packaging' / 'requirements_win32.txt' | ||||
| ) | ) | ||||
| inno_build_dir.mkdir(parents=True, exist_ok=True) | inno_build_dir.mkdir(parents=True, exist_ok=True) | ||||
| else: | else: | ||||
| basename = f.name | basename = f.name | ||||
| dest_path = staging_dir / basename | dest_path = staging_dir / basename | ||||
| print('copying %s to %s' % (f, dest_path)) | print('copying %s to %s' % (f, dest_path)) | ||||
| shutil.copyfile(f, dest_path) | shutil.copyfile(f, dest_path) | ||||
| build_installer( | |||||
| source_dir, | |||||
| inno_build_dir, | |||||
| staging_dir, | |||||
| iscc_exe, | |||||
| version, | |||||
| arch="x64" if vc_x64 else None, | |||||
| ) | |||||
| def build_installer( | |||||
| source_dir: pathlib.Path, | |||||
| inno_build_dir: pathlib.Path, | |||||
| staging_dir: pathlib.Path, | |||||
| iscc_exe: pathlib.Path, | |||||
| version, | |||||
| arch=None, | |||||
| ): | |||||
| """Build an Inno installer from staged Mercurial files. | |||||
| This function is agnostic about how to build Mercurial. It just | |||||
| cares that Mercurial files are in ``staging_dir``. | |||||
| """ | |||||
| inno_source_dir = source_dir / "contrib" / "packaging" / "inno" | |||||
| # The final package layout is simply a mirror of the staging directory. | # The final package layout is simply a mirror of the staging directory. | ||||
| package_files = [] | package_files = [] | ||||
| for root, dirs, files in os.walk(staging_dir): | for root, dirs, files in os.walk(staging_dir): | ||||
| dirs.sort() | dirs.sort() | ||||
| root = pathlib.Path(root) | root = pathlib.Path(root) | ||||
| for f in sorted(files): | for f in sorted(files): | ||||
| # Copy additional files used by Inno. | # Copy additional files used by Inno. | ||||
| for p in ('mercurial.ico', 'postinstall.txt'): | for p in ('mercurial.ico', 'postinstall.txt'): | ||||
| 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 vc_x64: | if arch: | ||||
| args.append('/dARCH=x64') | args.append('/dARCH=%s' % arch) | ||||
| 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) | ||||