This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11092

pyoxidizer: add hooks to inject extra python packages and install files
ClosedPublic

Authored by durin42 on Jul 14 2021, 3:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG11f834e7177d: pyoxidizer: add hooks to inject extra python packages and install files
Summary

We need this type of hook to inject our internal extension and resource files
at Google. Presumably this could be useful to others, so instead of trying to
carry an internal patch we've done this in a modular way that should be of
value upstream.

I'm extremely puzzled by the behavior of glob() on Windows, and I'll
be filing at least one (probably two) bugs upstream about it.

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

PathPackages
Mrust/hgcli/pyoxidizer.bzl (17 lines)

Diff 29360

rust/hgcli/pyoxidizer.bzl

# Add Mercurial to resources. # Add Mercurial to resources.
exe.add_python_resources(exe.pip_install(["--verbose", ROOT])) exe.add_python_resources(exe.pip_install(["--verbose", ROOT]))
# On Windows, we install extra packages for convenience. # On Windows, we install extra packages for convenience.
if IS_WINDOWS: if IS_WINDOWS:
exe.add_python_resources( exe.add_python_resources(
exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]), exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]),
) )
extra_packages = VARS.get("extra_py_packages", "")
if extra_packages:
for extra in extra_packages.split(","):
extra_src, pkgs = extra.split("=")
pkgs = pkgs.split(":")
exe.add_python_resources(exe.read_package_root(extra_src, pkgs))
return exe return exe
def make_manifest(dist, exe): def make_manifest(dist, exe):
m = FileManifest() m = FileManifest()
m.add_python_resource(".", exe) m.add_python_resource(".", exe)
return m return m
elif path.startswith("lib/mercurial/defaultrc/") and path.endswith(".rc"): elif path.startswith("lib/mercurial/defaultrc/") and path.endswith(".rc"):
new_path = path[len("lib/mercurial/"):] new_path = path[len("lib/mercurial/"):]
else: else:
continue continue
print("copying %s to %s" % (path, new_path)) print("copying %s to %s" % (path, new_path))
manifest.add_file(manifest.get_file(path), path = new_path) manifest.add_file(manifest.get_file(path), path = new_path)
extra_install_files = VARS.get("extra_install_files", "")
if extra_install_files:
for extra in extra_install_files.split(","):
print("adding extra files from %s" % extra)
# TODO: I expected a ** glob to work, but it didn't.
#
# TODO: I know this has forward-slash paths. As far as I can tell,
# backslashes don't ever match glob() expansions in
# tugger-starlark, even on Windows.
manifest.add_manifest(glob(include=[extra + "/*/*"], strip_prefix=extra+"/"))
# We also install a handful of additional files. # We also install a handful of additional files.
EXTRA_CONTRIB_FILES = [ EXTRA_CONTRIB_FILES = [
"bash_completion", "bash_completion",
"hgweb.fcgi", "hgweb.fcgi",
"hgweb.wsgi", "hgweb.wsgi",
"logo-droplets.svg", "logo-droplets.svg",
"mercurial.el", "mercurial.el",
"mq.el", "mq.el",