This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9289

pyoxidizer: default to one-file binary on non-Windows platforms
ClosedPublic

Authored by durin42 on Nov 10 2020, 1:16 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf14c33b2e497: pyoxidizer: default to one-file binary on non-Windows platforms
Summary

Windows has some extra constraints that require a multi-file install,
but we expect folks to use an MSI or similar installer there so it's
less of a big deal.

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

durin42 created this revision.Nov 10 2020, 1:16 PM
indygreg accepted this revision.Nov 10 2020, 8:47 PM
indygreg added a subscriber: indygreg.

I think this should work.

Before we ship this configuration to end users as part of our official distributions, I think we should figure out a story around enabling users to modify templates. The workflow today is "copy the templates files from your install directory." We need to provide a command for accessing the Python resource data embedded in the binary in the absence of these files.

This revision is now accepted and ready to land.Nov 10 2020, 8:47 PM

Revision Contents
Changeset List

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

Diff 23460

rust/hgcli/pyoxidizer.bzl

ROOT = CWD + "/../.." ROOT = CWD + "/../.."
IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
# Code to run in Python interpreter. # Code to run in Python interpreter.
RUN_CODE = "import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run()" RUN_CODE = "import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run()"
set_build_path(ROOT + "/build/pyoxidizer") set_build_path(ROOT + "/build/pyoxidizer")
def make_distribution(): def make_distribution():
return default_python_distribution() return default_python_distribution()
def make_distribution_windows(): def make_distribution_windows():
return default_python_distribution(flavor = "standalone_dynamic") return default_python_distribution(flavor = "standalone_dynamic")
def resource_callback(policy, resource): def resource_callback(policy, resource):
if not IS_WINDOWS:
resource.add_location = "in-memory"
return
# We use a custom resource routing policy to influence where things are loaded # We use a custom resource routing policy to influence where things are loaded
# from. # from.
# #
# For Python modules and resources, we load from memory if they are in # For Python modules and resources, we load from memory if they are in
# the standard library and from the filesystem if not. This is because # the standard library and from the filesystem if not. This is because
# parts of Mercurial and some 3rd party packages aren't yet compatible # parts of Mercurial and some 3rd party packages aren't yet compatible
# with memory loading. # with memory loading.
# #
def make_exe(dist): def make_exe(dist):
"""Builds a Rust-wrapped Mercurial binary.""" """Builds a Rust-wrapped Mercurial binary."""
packaging_policy = dist.make_python_packaging_policy() packaging_policy = dist.make_python_packaging_policy()
# Extension may depend on any Python functionality. Include all # Extension may depend on any Python functionality. Include all
# extensions. # extensions.
packaging_policy.extension_module_filter = "all" packaging_policy.extension_module_filter = "all"
packaging_policy.resources_location = "in-memory" packaging_policy.resources_location = "in-memory"
if IS_WINDOWS:
packaging_policy.resources_location_fallback = "filesystem-relative:lib" packaging_policy.resources_location_fallback = "filesystem-relative:lib"
packaging_policy.register_resource_callback(resource_callback) packaging_policy.register_resource_callback(resource_callback)
config = dist.make_python_interpreter_config() config = dist.make_python_interpreter_config()
config.raw_allocator = "system" config.raw_allocator = "system"
config.run_mode = "eval:%s" % RUN_CODE config.run_mode = "eval:%s" % RUN_CODE
# We want to let the user load extensions from the file system # We want to let the user load extensions from the file system
config.filesystem_importer = True config.filesystem_importer = True
# We need this to make resourceutil happy, since it looks for sys.frozen. # We need this to make resourceutil happy, since it looks for sys.frozen.