This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7157

packaging: install and run Inno files in a build directory
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG10454e788111: packaging: install and run Inno files in a build directory
rHG876a3dd74c8c: packaging: install and run Inno files in a build directory
Summary

Upcoming commits will refactor the Windows installers so their
content is dynamically derived. In preparation for this, we
copy the Inno files into a new build directory and run them
from there. This required changing some relative paths to
work from a new directory level but is otherwise a pretty
straightforward change.

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.

Revision Contents
Changeset List

Diff 17810

contrib/packaging/hgpackaging/inno.py

import os import os
import pathlib import pathlib
import shutil import shutil
import subprocess import subprocess
from .py2exe import build_py2exe from .py2exe import build_py2exe
from .util import find_vc_runtime_files from .util import find_vc_runtime_files
EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'dulwich', 'dulwich',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
py2exe's setup.py doesn't use setuptools. It doesn't have modern logic py2exe's setup.py doesn't use setuptools. It doesn't have modern logic
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'
inno_source_dir = source_dir / 'contrib' / 'packaging' / 'inno'
inno_build_dir = build_dir / ('inno-%s' % arch)
requirements_txt = ( requirements_txt = (
source_dir / 'contrib' / 'packaging' / 'inno' / 'requirements.txt' source_dir / 'contrib' / 'packaging' / 'inno' / 'requirements.txt'
) )
inno_build_dir.mkdir(parents=True, exist_ok=True)
build_py2exe( build_py2exe(
source_dir, source_dir,
build_dir, build_dir,
python_exe, python_exe,
'inno', 'inno',
requirements_txt, requirements_txt,
extra_packages=EXTRA_PACKAGES, extra_packages=EXTRA_PACKAGES,
) )
# hg.exe depends on VC9 runtime DLLs. Copy those into place. # hg.exe depends on VC9 runtime DLLs. Copy those into place.
for f in find_vc_runtime_files(vc_x64): for f in find_vc_runtime_files(vc_x64):
if f.name.endswith('.manifest'): if f.name.endswith('.manifest'):
basename = 'Microsoft.VC90.CRT.manifest' basename = 'Microsoft.VC90.CRT.manifest'
else: else:
basename = f.name basename = f.name
dest_path = source_dir / 'dist' / basename dest_path = source_dir / 'dist' / 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)
print('creating installer') print('creating installer')
# Copy Inno files into place.
for p in ('mercurial.iss', 'modpath.iss'):
shutil.copyfile(inno_source_dir / p, inno_build_dir / p)
args = [str(iscc_exe)] args = [str(iscc_exe)]
if vc_x64: if vc_x64:
args.append('/dARCH=x64') args.append('/dARCH=x64')
if version: if version:
args.append('/dVERSION=%s' % version) args.append('/dVERSION=%s' % version)
args.append('/Odist') args.append('/Odist')
args.append('contrib/packaging/inno/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/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 VERSION #ifndef VERSION
#define FileHandle #define FileHandle
#define FileLine #define FileLine
#define VERSION = "unknown" #define VERSION = "unknown"
#if FileHandle = FileOpen(SourcePath + "\..\..\..\mercurial\__version__.py") #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
#expr FileLine = FileRead(FileHandle) #expr FileLine = FileRead(FileHandle)
#expr FileLine = FileRead(FileHandle) #expr FileLine = FileRead(FileHandle)
#define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1) #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
#endif #endif
#if FileHandle #if FileHandle
#expr FileClose(FileHandle) #expr FileClose(FileHandle)
#endif #endif
#pragma message "Detected Version: " + VERSION #pragma message "Detected Version: " + VERSION
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/
AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
AppContact=mercurial@mercurial-scm.org AppContact=mercurial@mercurial-scm.org
DefaultDirName={pf}\Mercurial DefaultDirName={pf}\Mercurial
SourceDir=..\..\.. SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
VersionInfoCopyright=Copyright 2005-2019 Matt Mackall and others VersionInfoCopyright=Copyright 2005-2019 Matt Mackall and others
VersionInfoCompany=Matt Mackall and others VersionInfoCompany=Matt Mackall and others
InternalCompressLevel=max InternalCompressLevel=max
SolidCompression=true SolidCompression=true
SetupIconFile=contrib\win32\mercurial.ico SetupIconFile=contrib\win32\mercurial.ico
AllowNoIcons=true AllowNoIcons=true
DefaultGroupName=Mercurial DefaultGroupName=Mercurial