This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7161

packaging: always pass VERSION into Inno invocation
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7c9f63a5cb14: packaging: always pass VERSION into Inno invocation
rHGcf5eaf24577f: packaging: always pass VERSION into Inno invocation
Summary

The code in the Inno file was a holdover from before we had
Python driving execution.

With Python in the driver's seat, we can now have it resolve
the version string and pass it into Inno, making the code
easier to understand for people who aren't packaging gurus.

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: rHGcf5eaf24577f: packaging: always pass VERSION into Inno invocation.Nov 8 2019, 7:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGcf5eaf24577f: packaging: always pass VERSION into Inno invocation (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17813

contrib/packaging/hgpackaging/inno.py

import subprocess import subprocess
import jinja2 import jinja2
from .py2exe import ( from .py2exe import (
build_py2exe, build_py2exe,
stage_install, stage_install,
) )
from .util import find_vc_runtime_files from .util import (
find_vc_runtime_files,
read_version_py,
)
EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'dulwich', 'dulwich',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
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 vc_x64:
args.append('/dARCH=x64') args.append('/dARCH=x64')
if version: if not version:
version = read_version_py(source_dir)
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/hgpackaging/util.py

# util.py - Common packaging utility code. # util.py - Common packaging utility code.
# #
# 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 distutils.version import distutils.version
import getpass import getpass
import glob import glob
import os import os
import pathlib import pathlib
import re
import shutil import shutil
import subprocess import subprocess
import tarfile import tarfile
import zipfile import zipfile
def extract_tar_to_directory(source: pathlib.Path, dest: pathlib.Path): def extract_tar_to_directory(source: pathlib.Path, dest: pathlib.Path):
with tarfile.open(source, 'r') as tf: with tarfile.open(source, 'r') as tf:
dest_path = pathlib.Path(dest) dest_path = pathlib.Path(dest)
full_source_path = source_dir / source_path full_source_path = source_dir / source_path
full_dest_path = dest_dir / dest_path full_dest_path = dest_dir / dest_path
full_dest_path.parent.mkdir(parents=True, exist_ok=True) full_dest_path.parent.mkdir(parents=True, exist_ok=True)
shutil.copy(full_source_path, full_dest_path) shutil.copy(full_source_path, full_dest_path)
print('copying %s to %s' % (full_source_path, full_dest_path)) print('copying %s to %s' % (full_source_path, full_dest_path))
def read_version_py(source_dir):
"""Read the mercurial/__version__.py file to resolve the version string."""
p = source_dir / 'mercurial' / '__version__.py'
with p.open('r', encoding='utf-8') as fh:
m = re.search('version = b"([^"]+)"', fh.read(), re.MULTILINE)
if not m:
raise Exception('could not parse %s' % p)
return m.group(1)

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
#define FileHandle
#define FileLine
#define VERSION = "unknown"
#if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
#expr FileLine = FileRead(FileHandle)
#expr FileLine = FileRead(FileHandle)
#define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
#endif
#if FileHandle
#expr FileClose(FileHandle)
#endif
#pragma message "Detected Version: " + VERSION
#endif
#ifndef ARCH #ifndef ARCH
#define ARCH = "x86" #define ARCH = "x86"
#endif #endif
[Setup] [Setup]
AppCopyright=Copyright 2005-2019 Matt Mackall and others AppCopyright=Copyright 2005-2019 Matt Mackall and others
AppName=Mercurial AppName=Mercurial
AppVersion={#VERSION} AppVersion={#VERSION}