Skip to content

Commit a203ed5

Browse files
committed
More tweaks
1 parent 43594c8 commit a203ed5

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

cmake/yup_python.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,10 @@ function (yup_prepare_python_stdlib target_name python_tools_path output_variabl
4646
_yup_message (STATUS " * python_tools_path: ${python_tools_path}")
4747
_yup_message (STATUS " * ignored_library_patterns: ${ignored_library_patterns}")
4848

49-
#if (YUP_PLATFORM_WINDOWS)
50-
# execute_process (COMMAND dir "${python_root_path}" COMMAND_ECHO STDOUT)
51-
# execute_process (COMMAND dir "${python_root_path}/Lib" COMMAND_ECHO STDOUT)
52-
# execute_process (COMMAND dir "${python_root_path}/Scripts" COMMAND_ECHO STDOUT)
53-
# execute_process (COMMAND dir "${python_root_path}/DLLs" COMMAND_ECHO STDOUT)
54-
#endif()
55-
5649
execute_process (
5750
COMMAND
5851
"${Python_EXECUTABLE}" "${python_tools_path}/ArchivePythonStdlib.py"
59-
-v -r "${python_root_path}" -o "${CMAKE_CURRENT_BINARY_DIR}" -M "${Python_VERSION_MAJOR}" -m "${Python_VERSION_MINOR}"
52+
-r "${python_root_path}" -o "${CMAKE_CURRENT_BINARY_DIR}" -M "${Python_VERSION_MAJOR}" -m "${Python_VERSION_MINOR}"
6053
-x "\"${ignored_library_patterns}\""
6154
COMMAND_ECHO STDOUT
6255
COMMAND_ERROR_IS_FATAL ANY)

python/tools/ArchivePythonStdlib.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ def make_archive(file, directory, verbose=False):
2323
path = os.path.join(dirname, filename)
2424
archived_files.append((path, os.path.relpath(path, directory)))
2525

26-
print(f"Added to zip: {path}")
27-
2826
with zipfile.ZipFile(file, "w") as zf:
2927
for path, archive_path in sorted(archived_files):
3028
permission = 0o555 if os.access(path, os.X_OK) else 0o444
@@ -36,8 +34,8 @@ def make_archive(file, directory, verbose=False):
3634
with open(path, "rb") as fp:
3735
zf.writestr(zip_info, fp.read(), compress_type=zipfile.ZIP_DEFLATED, compresslevel=9)
3836

39-
#if verbose:
40-
# print(f"Added to zip: {archive_path}")
37+
if verbose:
38+
print(f"Added to zip: {archive_path}")
4139

4240

4341
if __name__ == "__main__":

0 commit comments

Comments
 (0)