[Updated] D11451: pyoxidizer: don't use in-memory for resources on macOS

[mharbison72 (Matt Harbison)]

Closed by commit rHG7bc1beedd718: pyoxidizer: don't use in-memory for resources on macOS (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11451?vs=30294&id=30792

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11451/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11451

AFFECTED FILES
  rust/hgcli/pyoxidizer.bzl

CHANGE DETAILS

diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl
+++ b/rust/hgcli/pyoxidizer.bzl
@@ -33,6 +33,7 @@
 TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com")
 
 IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
+IS_MACOS = "darwin" in BUILD_TARGET_TRIPLE
 
 # Code to run in Python interpreter.
 RUN_CODE = """
@@ -69,7 +70,7 @@
     return default_python_distribution(python_version = "3.9")
 
 def resource_callback(policy, resource):
-    if not IS_WINDOWS:
+    if not (IS_WINDOWS or IS_MACOS):
         resource.add_location = "in-memory"
         return
 
@@ -100,7 +101,7 @@
     # extensions.
     packaging_policy.extension_module_filter = "all"
     packaging_policy.resources_location = "in-memory"
-    if IS_WINDOWS:
+    if IS_WINDOWS or IS_MACOS:
         packaging_policy.resources_location_fallback = "filesystem-relative:lib"
     packaging_policy.register_resource_callback(resource_callback)
 



To: mharbison72, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211013/4810995a/attachment-0002.html>