From ac54a2825ff69a0f1d264ec6ebd5f1951daf26e7 Mon Sep 17 00:00:00 2001 From: valord577 Date: Thu, 4 Jun 2026 20:37:26 +0800 Subject: [PATCH] rename dir: scripts -> buildx --- .github/ccache_get.py | 2 +- .github/ccache_put.py | 2 +- .github/library_packed.py | 2 +- .github/rclone.py | 2 +- .github/setenv_00.py | 2 +- .github/setenv_01.py | 2 +- build.py | 4 ++-- {scripts => buildx}/get_prebuilt.py | 0 {scripts => buildx}/tree.py | 9 +++++++-- {scripts => buildx}/utils.py | 2 +- modules/dav1d.py | 2 +- modules/ffmpeg.py | 2 +- modules/libexpat.py | 2 +- modules/libjpeg80.py | 2 +- modules/libpng16.py | 2 +- modules/llvm.py | 2 +- modules/mbedtls3.py | 2 +- modules/mbedtls4.py | 2 +- modules/sdl2.py | 2 +- modules/zlib-ng.py | 2 +- 20 files changed, 26 insertions(+), 21 deletions(-) rename {scripts => buildx}/get_prebuilt.py (100%) rename {scripts => buildx}/tree.py (84%) rename {scripts => buildx}/utils.py (98%) diff --git a/.github/ccache_get.py b/.github/ccache_get.py index 76254a0..d7e78a8 100755 --- a/.github/ccache_get.py +++ b/.github/ccache_get.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- diff --git a/.github/ccache_put.py b/.github/ccache_put.py index f889a5c..4ca3c45 100755 --- a/.github/ccache_put.py +++ b/.github/ccache_put.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- diff --git a/.github/library_packed.py b/.github/library_packed.py index c379ac8..c0f5f0e 100755 --- a/.github/library_packed.py +++ b/.github/library_packed.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/.github/rclone.py b/.github/rclone.py index 5669927..8510de0 100755 --- a/.github/rclone.py +++ b/.github/rclone.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- import glob diff --git a/.github/setenv_00.py b/.github/setenv_00.py index 918b93f..e50eaac 100755 --- a/.github/setenv_00.py +++ b/.github/setenv_00.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/.github/setenv_01.py b/.github/setenv_01.py index 5b6107a..f005800 100755 --- a/.github/setenv_01.py +++ b/.github/setenv_01.py @@ -9,7 +9,7 @@ sys.path.append( (Path(__file__).parent / '..').absolute().as_posix() ) -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/build.py b/build.py index 02e5812..8bc5de4 100755 --- a/build.py +++ b/build.py @@ -5,7 +5,7 @@ import sys sys.dont_write_bytecode = True -from scripts import utils as x +from buildx import utils as x # ---------------------------- @@ -701,6 +701,6 @@ def show_help(exitcode = 1) -> NoReturn: func() if not x.ON_CODE_EDIT: x._util_func__exec_python([ - (Path(x.PROJ_ROOT) / 'scripts' / 'tree.py').absolute().as_posix(), _pkg_inst_dir, '3' + (Path(x.PROJ_ROOT) / 'buildx' / 'tree.py').absolute().as_posix(), _pkg_inst_dir, '3' ]) x.print_stderr(f'──── Build Done @{dt.datetime.now(dt.timezone.utc).strftime("%Y-%m-%d %H:%M:%S %Z")} ────') diff --git a/scripts/get_prebuilt.py b/buildx/get_prebuilt.py similarity index 100% rename from scripts/get_prebuilt.py rename to buildx/get_prebuilt.py diff --git a/scripts/tree.py b/buildx/tree.py similarity index 84% rename from scripts/tree.py rename to buildx/tree.py index 118279e..c108496 100755 --- a/scripts/tree.py +++ b/buildx/tree.py @@ -11,6 +11,10 @@ from pathlib import Path +def _format_size(_path: Path) -> str: + _size = _path.stat().st_size + return f'{_size} bytes (≈ {(_size / 1024.0):.3f} KiB)' + basepath = Path(sys.argv[1]) depth = 0 if len(sys.argv) > 2: @@ -27,13 +31,14 @@ _name_with_symlink = _path.as_posix() if _is_symlink: _name_with_symlink = f'{_name_with_symlink} -> {_path.readlink().as_posix()}' + _line = f'[{_format_size(_path)}] {_name_with_symlink}' _child_prefixes: list[str] = [] if _depth == -1: - x.print_stderr(f"{_name_with_symlink}") + x.print_stderr(f"{_line}") else: _child_prefixes = _prefixes + [' ' if _connector.startswith('└') else '│ '] - x.print_stderr(f"{''.join(_prefixes)}{_connector}{_name_with_symlink}") + x.print_stderr(f"{''.join(_prefixes)}{_connector}{_line}") if (not _is_dir) or (depth > 0 and _depth + 1 >= depth): continue diff --git a/scripts/utils.py b/buildx/utils.py similarity index 98% rename from scripts/utils.py rename to buildx/utils.py index 62fc0d3..511771a 100644 --- a/scripts/utils.py +++ b/buildx/utils.py @@ -84,7 +84,7 @@ def _util_func__pip_install(packages: list[str]): _util_func__exec_python(args=args) def _util_func__dl_3rd_deps(args: list[str]): _util_func__exec_python(args=[ - (Path(PROJ_ROOT) / 'scripts' / 'get_prebuilt.py').absolute().as_posix(), *args + (Path(PROJ_ROOT) / 'buildx' / 'get_prebuilt.py').absolute().as_posix(), *args ]) def _util_put_pkg_version_desc(pkg_name: str, ver: str): diff --git a/modules/dav1d.py b/modules/dav1d.py index d04ea3e..bae2219 100755 --- a/modules/dav1d.py +++ b/modules/dav1d.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/ffmpeg.py b/modules/ffmpeg.py index f16153b..b3a903b 100755 --- a/modules/ffmpeg.py +++ b/modules/ffmpeg.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/libexpat.py b/modules/libexpat.py index 27f0ea9..3d8a544 100755 --- a/modules/libexpat.py +++ b/modules/libexpat.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/libjpeg80.py b/modules/libjpeg80.py index 7d28d92..f508e53 100755 --- a/modules/libjpeg80.py +++ b/modules/libjpeg80.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/libpng16.py b/modules/libpng16.py index d107dc5..e0a91e0 100755 --- a/modules/libpng16.py +++ b/modules/libpng16.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/llvm.py b/modules/llvm.py index 1ecb1f5..bd48407 100755 --- a/modules/llvm.py +++ b/modules/llvm.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/mbedtls3.py b/modules/mbedtls3.py index 301c42e..c52dbad 100755 --- a/modules/mbedtls3.py +++ b/modules/mbedtls3.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/mbedtls4.py b/modules/mbedtls4.py index f2af352..27f9d1f 100755 --- a/modules/mbedtls4.py +++ b/modules/mbedtls4.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/sdl2.py b/modules/sdl2.py index 2a94753..06cfa11 100755 --- a/modules/sdl2.py +++ b/modules/sdl2.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os diff --git a/modules/zlib-ng.py b/modules/zlib-ng.py index 8f91664..99968f4 100755 --- a/modules/zlib-ng.py +++ b/modules/zlib-ng.py @@ -2,7 +2,7 @@ # fmt: off -from scripts import utils as x +from buildx import utils as x # ---------------------------- import os