This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7158

packaging: process Inno Setup files with Jinja2
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7bd88d0d6a82: packaging: process Inno Setup files with Jinja2
rHG04b862675439: packaging: process Inno Setup files with Jinja2
Summary

I want to make the Inno Setup files dynamically generated.
This will enable us to do things like automatically derive the
set of files to be packaged instead of having to manually
keep lists of files in sync across installers.

As the first step towards this, we process the Inno Setup
files with Jinja2.

As part of this conversion, we had to escape syntax in
mercurial.iss that conflicts with Jinja2. I also took the
opportunity to include modpath.iss via Jinja2 instead of
using Inno's preprocessor. This keeps the Python code a
bit simpler.

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.Oct 23 2019, 9:54 PM
indygreg added a commit: rHG04b862675439: packaging: process Inno Setup files with Jinja2.Nov 8 2019, 7:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG04b862675439: packaging: process Inno Setup files with Jinja2 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17809

contrib/packaging/hgpackaging/inno.py

# inno.py - Inno Setup functionality. # inno.py - Inno Setup functionality.
# #
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native. # no-check-code because Python 3 native.
import os import os
import pathlib import pathlib
import shutil import shutil
import subprocess import subprocess
import jinja2
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',
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. # Install Inno files by rendering a template.
for p in ('mercurial.iss', 'modpath.iss'): jinja_env = jinja2.Environment(
shutil.copyfile(inno_source_dir / p, inno_build_dir / p) loader=jinja2.FileSystemLoader(str(inno_source_dir)),
# Need to change these to prevent conflict with Inno Setup.
comment_start_string='{##',
comment_end_string='##}',
)
try:
template = jinja_env.get_template('mercurial.iss')
except jinja2.TemplateSyntaxError as e:
raise Exception(
'template syntax error at %s:%d: %s'
% (e.name, e.lineno, e.message,)
)
content = template.render()
with (inno_build_dir / 'mercurial.iss').open('w', encoding='utf-8') as fh:
fh.write(content)
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(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/inno/mercurial.iss

#endif #endif
InfoAfterFile=contrib/win32/postinstall.txt InfoAfterFile=contrib/win32/postinstall.txt
LicenseFile=COPYING LicenseFile=COPYING
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
ModPathName = 'modifypath'; ModPathName = 'modifypath';
ModPathType = 'user'; ModPathType = 'user';
function ModPathDir(): TArrayOfString; function ModPathDir(): TArrayOfString;
begin begin
setArrayLength(Result, 1) setArrayLength(Result, 1)
Result[0] := ExpandConstant('{app}'); Result[0] := ExpandConstant('{app}');
end; end;
#include "modpath.iss"
{% include 'modpath.iss' %}