Show More
@@ -18,7 +18,7 b' from .py2exe import (' | |||
|
18 | 18 | build_py2exe, |
|
19 | 19 | stage_install, |
|
20 | 20 | ) |
|
21 |
from .pyoxidizer import |
|
|
21 | from .pyoxidizer import create_pyoxidizer_install_layout | |
|
22 | 22 | from .util import ( |
|
23 | 23 | find_legacy_vc_runtime_files, |
|
24 | 24 | normalize_windows_version, |
@@ -136,7 +136,9 b' def build_with_pyoxidizer(' | |||
|
136 | 136 | staging_dir = inno_build_dir / "stage" |
|
137 | 137 | |
|
138 | 138 | inno_build_dir.mkdir(parents=True, exist_ok=True) |
|
139 | run_pyoxidizer(source_dir, inno_build_dir, staging_dir, target_triple) | |
|
139 | create_pyoxidizer_install_layout( | |
|
140 | source_dir, inno_build_dir, staging_dir, target_triple | |
|
141 | ) | |
|
140 | 142 | |
|
141 | 143 | process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir) |
|
142 | 144 |
@@ -68,7 +68,7 b' def build_docs_html(source_dir: pathlib.' | |||
|
68 | 68 | ) |
|
69 | 69 | |
|
70 | 70 | |
|
71 |
def |
|
|
71 | def create_pyoxidizer_install_layout( | |
|
72 | 72 | source_dir: pathlib.Path, |
|
73 | 73 | build_dir: pathlib.Path, |
|
74 | 74 | out_dir: pathlib.Path, |
@@ -22,7 +22,7 b' from .py2exe import (' | |||
|
22 | 22 | build_py2exe, |
|
23 | 23 | stage_install, |
|
24 | 24 | ) |
|
25 |
from .pyoxidizer import |
|
|
25 | from .pyoxidizer import create_pyoxidizer_install_layout | |
|
26 | 26 | from .util import ( |
|
27 | 27 | extract_zip_to_directory, |
|
28 | 28 | normalize_windows_version, |
@@ -391,7 +391,9 b' def build_installer_pyoxidizer(' | |||
|
391 | 391 | arch = "x64" if "x86_64" in target_triple else "x86" |
|
392 | 392 | |
|
393 | 393 | build_dir.mkdir(parents=True, exist_ok=True) |
|
394 | run_pyoxidizer(source_dir, build_dir, staging_dir, target_triple) | |
|
394 | create_pyoxidizer_install_layout( | |
|
395 | source_dir, build_dir, staging_dir, target_triple | |
|
396 | ) | |
|
395 | 397 | |
|
396 | 398 | # We also install some extra files. |
|
397 | 399 | process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir) |
General Comments 0
You need to be logged in to leave comments.
Login now