( )⚙ D10681 pyoxidizer: simplify targets

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10681

pyoxidizer: simplify targets
ClosedPublic

Authored by indygreg on May 6 2021, 8:00 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG9438e9b7321a: pyoxidizer: simplify targets
Summary

The split targets existed to enable the use of a non-default
distribution flavor on Windows. Modern versions of PyOxidizer
use the "standalone_dynamic" distribution flavor by default.
So our split brain workaround is no longer needed.

Here, we unify the targets. We also remove an unreferenced
target function to create a resources file.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.May 6 2021, 8:00 PM
baymax updated this revision to Diff 27752.May 7 2021, 11:30 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27789.May 10 2021, 11:37 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

mharbison72 accepted this revision.May 10 2021, 6:38 PM
This revision is now accepted and ready to land.May 10 2021, 6:38 PM
indygreg added a commit: rHG9438e9b7321a: pyoxidizer: simplify targets.May 15 2021, 7:23 PM
Closed by commit rHG9438e9b7321a: pyoxidizer: simplify targets (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 27752

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(python_version = "3.8") return default_python_distribution(python_version = "3.8")
def make_distribution_windows():
return default_python_distribution(flavor = "standalone_dynamic")
def resource_callback(policy, resource): def resource_callback(policy, resource):
if not IS_WINDOWS: if not IS_WINDOWS:
resource.add_location = "in-memory" resource.add_location = "in-memory"
return 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.
# #
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
def make_embedded_resources(exe): register_target("distribution", make_distribution)
return exe.to_embedded_resources() register_target("exe", make_exe, depends = ["distribution"])
register_target("app", make_manifest, depends = ["distribution", "exe"], default = True)
register_target("distribution_posix", make_distribution)
register_target("distribution_windows", make_distribution_windows)
register_target("exe_posix", make_exe, depends = ["distribution_posix"])
register_target("exe_windows", make_exe, depends = ["distribution_windows"])
register_target(
"app_posix",
make_manifest,
depends = ["distribution_posix", "exe_posix"],
default = "windows" not in BUILD_TARGET_TRIPLE,
)
register_target(
"app_windows",
make_manifest,
depends = ["distribution_windows", "exe_windows"],
default = "windows" in BUILD_TARGET_TRIPLE,
)
resolve_targets() resolve_targets()