packaging: rename run_pyoxidizer()
I'm going to split this function up in a future commit and I'll
want the name "run_pyoxidizer()" for a lower-level function for
invoking `pyoxidizer`.
Differential Revision: https://phab.mercurial-scm.org/D10686
--- a/contrib/packaging/hgpackaging/inno.py Thu May 06 08:37:40 2021 -0700
+++ b/contrib/packaging/hgpackaging/inno.py Thu May 06 16:06:20 2021 -0700
@@ -18,7 +18,7 @@
build_py2exe,
stage_install,
)
-from .pyoxidizer import run_pyoxidizer
+from .pyoxidizer import create_pyoxidizer_install_layout
from .util import (
find_legacy_vc_runtime_files,
normalize_windows_version,
@@ -136,7 +136,9 @@
staging_dir = inno_build_dir / "stage"
inno_build_dir.mkdir(parents=True, exist_ok=True)
- run_pyoxidizer(source_dir, inno_build_dir, staging_dir, target_triple)
+ create_pyoxidizer_install_layout(
+ source_dir, inno_build_dir, staging_dir, target_triple
+ )
process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)
--- a/contrib/packaging/hgpackaging/pyoxidizer.py Thu May 06 08:37:40 2021 -0700
+++ b/contrib/packaging/hgpackaging/pyoxidizer.py Thu May 06 16:06:20 2021 -0700
@@ -68,7 +68,7 @@
)
-def run_pyoxidizer(
+def create_pyoxidizer_install_layout(
source_dir: pathlib.Path,
build_dir: pathlib.Path,
out_dir: pathlib.Path,
--- a/contrib/packaging/hgpackaging/wix.py Thu May 06 08:37:40 2021 -0700
+++ b/contrib/packaging/hgpackaging/wix.py Thu May 06 16:06:20 2021 -0700
@@ -22,7 +22,7 @@
build_py2exe,
stage_install,
)
-from .pyoxidizer import run_pyoxidizer
+from .pyoxidizer import create_pyoxidizer_install_layout
from .util import (
extract_zip_to_directory,
normalize_windows_version,
@@ -391,7 +391,9 @@
arch = "x64" if "x86_64" in target_triple else "x86"
build_dir.mkdir(parents=True, exist_ok=True)
- run_pyoxidizer(source_dir, build_dir, staging_dir, target_triple)
+ create_pyoxidizer_install_layout(
+ source_dir, build_dir, staging_dir, target_triple
+ )
# We also install some extra files.
process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)