This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11734

pyoxidizer: use in-memory resources on non-Windows platforms
ClosedPublic

Authored by spectral on Nov 3 2021, 5:17 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1a420a13eeea: pyoxidizer: use in-memory resources on non-Windows platforms
Summary

In-memory resources were disabled for macOS in 7bc1beed, and for all platforms
in c900d962. Unfortunately this made it so that we were no longer producing
standalone binaries on these platforms, and would have to ship the .py and .pyc
files alongside the pyoxidized binary.

These changes are no longer necessary after f6b04591, which disabled pep517 and
solved the issue we were encountering.

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

spectral created this revision.Nov 3 2021, 5:17 PM
Alphare accepted this revision.Nov 4 2021, 10:41 AM
This revision is now accepted and ready to land.Nov 4 2021, 10:41 AM

Revision Contents
Changeset List

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

Diff 31022

rust/hgcli/pyoxidizer.bzl

EXTRA_MSI_FEATURES = VARS.get("EXTRA_MSI_FEATURES") EXTRA_MSI_FEATURES = VARS.get("EXTRA_MSI_FEATURES")
SIGNING_PFX_PATH = VARS.get("SIGNING_PFX_PATH") SIGNING_PFX_PATH = VARS.get("SIGNING_PFX_PATH")
SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "") SIGNING_PFX_PASSWORD = VARS.get("SIGNING_PFX_PASSWORD", "")
SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME") SIGNING_SUBJECT_NAME = VARS.get("SIGNING_SUBJECT_NAME")
TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com") TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com")
IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
USE_IN_MEMORY_RESOURCES = False # Use in-memory resources for all resources. If false, most of the Python
# stdlib will be in memory, but other things such as Mercurial itself will not
# be. See the comment in resource_callback, below.
USE_IN_MEMORY_RESOURCES = not IS_WINDOWS
# Code to run in Python interpreter. # Code to run in Python interpreter.
RUN_CODE = """ RUN_CODE = """
import os import os
import sys import sys
extra_path = os.environ.get('PYTHONPATH') extra_path = os.environ.get('PYTHONPATH')
if extra_path is not None: if extra_path is not None:
# extensions and hooks expect a working python environment # extensions and hooks expect a working python environment