##// END OF EJS Templates
make: switch the PYTHON default to `py.exe -3` on Windows...
make: switch the PYTHON default to `py.exe -3` on Windows Python3 _is_ named `python.exe` on Windows, but that isn't necessarily on PATH when installing from python.org. I do happen to have a python.exe on PATH in `$LOCALAPPDATA/Microsoft/WindowsApps`, but it appears to be 0 bytes (likely because of permission issues), and doesn't run: $ python -V - Cannot open Pulkit hit the same error as I did though, so it isn't just my system: $ make -C . local make: Entering directory `/home/Dell/repos/hg-committed` python setup.py \ build_py -c -d . \ build_ext -i \ build_hgexe -i \ build_mo - Cannot openmake: *** [local] Error 1 The `py.exe` dispatcher lives in the Windows directory (so it is on PATH), looks up the python.org installation, and invokes that interpreter directly. I get a warning with py39, but if it's our issue, it was an existing one: $ make -C .. local make: Entering directory `/c/Users/Matt/hg' py -3 setup.py \ build_py -c -d . \ build_ext -i \ build_hgexe -i \ build_mo C:\Users\Matt\AppData\Local\Programs\Python\Python39\lib\site-packages\setuptools\distutils_patch.py:25: UserWarning: Distutils was imported before Setuptools. This usage is discouraged and may exhibit undesirable behaviors or errors. Please use Setuptools' objects directly or at least import Setuptools first. warnings.warn( The end result is a py3 based hg.exe that annoyingly won't run because it can't find python39.dll. It will run tests (the ones without the `python3` shbang line anyway), because the test runner adjusts PATH to include the python running it. Differential Revision: https://phab.mercurial-scm.org/D9361

File last commit:

r45260:c9517d9d default
r46510:4f6816e8 default
Show More
cli.py
183 lines | 5.1 KiB | text/x-python | PythonLexer
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 # cli.py - Command line interface for automation
#
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native.
import argparse
import os
import pathlib
from . import (
inno,
wix,
)
HERE = pathlib.Path(os.path.abspath(os.path.dirname(__file__)))
SOURCE_DIR = HERE.parent.parent.parent
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 def build_inno(pyoxidizer_target=None, python=None, iscc=None, version=None):
if not pyoxidizer_target and not python:
raise Exception("--python required unless building with PyOxidizer")
if python and not os.path.isabs(python):
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 raise Exception("--python arg must be an absolute path")
if iscc:
iscc = pathlib.Path(iscc)
else:
iscc = (
pathlib.Path(os.environ["ProgramFiles(x86)"])
/ "Inno Setup 5"
/ "ISCC.exe"
)
build_dir = SOURCE_DIR / "build"
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 if pyoxidizer_target:
inno.build_with_pyoxidizer(
SOURCE_DIR, build_dir, pyoxidizer_target, iscc, version=version
)
else:
inno.build_with_py2exe(
SOURCE_DIR, build_dir, pathlib.Path(python), iscc, version=version,
)
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913
def build_wix(
name=None,
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 pyoxidizer_target=None,
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 python=None,
version=None,
sign_sn=None,
sign_cert=None,
sign_password=None,
sign_timestamp_url=None,
extra_packages_script=None,
extra_wxs=None,
extra_features=None,
):
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 if not pyoxidizer_target and not python:
raise Exception("--python required unless building with PyOxidizer")
if python and not os.path.isabs(python):
raise Exception("--python arg must be an absolute path")
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 kwargs = {
"source_dir": SOURCE_DIR,
"version": version,
}
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 if pyoxidizer_target:
fn = wix.build_installer_pyoxidizer
kwargs["target_triple"] = pyoxidizer_target
else:
fn = wix.build_installer_py2exe
kwargs["python_exe"] = pathlib.Path(python)
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913
if extra_packages_script:
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 if pyoxidizer_target:
raise Exception(
"pyoxidizer does not support --extra-packages-script"
)
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 kwargs["extra_packages_script"] = extra_packages_script
if extra_wxs:
kwargs["extra_wxs"] = dict(
thing.split("=") for thing in extra_wxs.split(",")
)
if extra_features:
kwargs["extra_features"] = extra_features.split(",")
if sign_sn or sign_cert:
Gregory Szorc
packaging: integrate signing into run_wix_packaging()...
r45272 kwargs["signing_info"] = {
"name": name,
"subject_name": sign_sn,
"cert_path": sign_cert,
"cert_password": sign_password,
"timestamp_url": sign_timestamp_url,
}
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 fn(**kwargs)
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913
def get_parser():
parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers()
sp = subparsers.add_parser("inno", help="Build Inno Setup installer")
Gregory Szorc
packaging: support building Inno installer with PyOxidizer...
r45270 sp.add_argument(
"--pyoxidizer-target",
choices={"i686-pc-windows-msvc", "x86_64-pc-windows-msvc"},
help="Build with PyOxidizer targeting this host triple",
)
sp.add_argument("--python", help="path to python.exe to use")
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 sp.add_argument("--iscc", help="path to iscc.exe to use")
sp.add_argument(
"--version",
help="Mercurial version string to use "
"(detected from __version__.py if not defined",
)
sp.set_defaults(func=build_inno)
sp = subparsers.add_parser(
"wix", help="Build Windows installer with WiX Toolset"
)
sp.add_argument("--name", help="Application name", default="Mercurial")
sp.add_argument(
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 "--pyoxidizer-target",
choices={"i686-pc-windows-msvc", "x86_64-pc-windows-msvc"},
help="Build with PyOxidizer targeting this host triple",
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 )
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 sp.add_argument("--python", help="Path to Python executable to use")
Gregory Szorc
packaging: consolidate CLI functionality into packaging.py...
r43913 sp.add_argument(
"--sign-sn",
help="Subject name (or fragment thereof) of certificate "
"to use for signing",
)
sp.add_argument(
"--sign-cert", help="Path to certificate to use for signing"
)
sp.add_argument("--sign-password", help="Password for signing certificate")
sp.add_argument(
"--sign-timestamp-url",
help="URL of timestamp server to use for signing",
)
sp.add_argument("--version", help="Version string to use")
sp.add_argument(
"--extra-packages-script",
help=(
"Script to execute to include extra packages in " "py2exe binary."
),
)
sp.add_argument(
"--extra-wxs", help="CSV of path_to_wxs_file=working_dir_for_wxs_file"
)
sp.add_argument(
"--extra-features",
help=(
"CSV of extra feature names to include "
"in the installer from the extra wxs files"
),
)
sp.set_defaults(func=build_wix)
return parser
def main():
parser = get_parser()
args = parser.parse_args()
if not hasattr(args, "func"):
parser.print_help()
return
kwargs = dict(vars(args))
del kwargs["func"]
args.func(**kwargs)