mirror of
https://github.com/okhsunrog/vpnhide.git
synced 2026-05-02 16:42:15 +00:00
06640d9b16
Follow-up to #83. Five small fixes I caught while reviewing: - build_lib: spell out the stdlib-only invariant in the module docstring. build-version.py is called from app/build.gradle.kts on every Gradle build, so adding pip/uv deps here would break the APK build. - build_lib: drop unused get_python_exe() (no callers anywhere). - build_lib: add version_sort_key() and use it in zygisk and kmod for NDK / clang auto-detection. The previous lexicographic sorted() picked the wrong directory when major versions span different digit widths (e.g. 100.0.0 < 25.0.1, clang-r9 sorting after clang-r498344b). zygisk/build-zip.sh used `sort -V` before the python port, so this is a regression fix; kmod is a new safety net (DDK containers ship one clang today, but auto-detect should still be correct). - kmod/build-zip.py: drop the manual mtime check before `make strip`. The check only watched vpnhide_kmod.c, so edits to the Makefile, kernel headers, or .config wouldn't trigger a rebuild. Let make's own dependency tracking decide. - build_lib: minor cleanup — hoist `import subprocess` to the top of the module instead of importing it inside get_build_version().
60 lines
2.1 KiB
Python
60 lines
2.1 KiB
Python
"""Shared helpers for build scripts.
|
|
|
|
Used by kmod/build-zip.py, portshide/build-zip.py, zygisk/build-zip.py,
|
|
and scripts/build-version.py.
|
|
|
|
Stdlib-only on purpose: scripts/build-version.py is invoked from
|
|
lsposed/app/build.gradle.kts on every Gradle build, so adding pip/uv
|
|
dependencies here would break the APK build for anyone without those
|
|
tools available.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
import subprocess
|
|
import zipfile
|
|
from pathlib import Path
|
|
|
|
|
|
def make_zip(source_dir: Path, output_zip: Path) -> None:
|
|
"""Create a zip archive from source_dir contents."""
|
|
with zipfile.ZipFile(output_zip, "w", zipfile.ZIP_DEFLATED) as zf:
|
|
for file_path in source_dir.rglob("*"):
|
|
if file_path.is_file():
|
|
arcname = file_path.relative_to(source_dir)
|
|
zf.write(file_path, arcname)
|
|
|
|
|
|
def version_sort_key(name: str) -> tuple[int, ...]:
|
|
"""Sort key that orders strings by their embedded integer runs.
|
|
|
|
Used to pick the highest version when multiple toolchain directories
|
|
coexist (NDK 25.0.1 vs 100.0.0, clang-r450b vs clang-r498344b) where
|
|
plain lexicographic sort gives the wrong answer.
|
|
"""
|
|
return tuple(int(part) for part in re.findall(r"\d+", name))
|
|
|
|
|
|
def get_build_version(repo_root: Path | None = None) -> str:
|
|
"""Get the effective build version for vpnhide artifacts.
|
|
|
|
- HEAD on a tag vX.Y.Z -> "X.Y.Z" (release build)
|
|
- N commits after tag vX.Y.Z -> "X.Y.Z-N-gSHA" (dev build)
|
|
- working tree dirty -> additional "-dirty" suffix
|
|
- no git / no matching tag -> falls back to VERSION file
|
|
"""
|
|
if repo_root is None:
|
|
repo_root = Path(__file__).resolve().parent.parent
|
|
|
|
result = subprocess.run(
|
|
["git", "describe", "--tags", "--match", "v*", "--dirty"],
|
|
cwd=repo_root,
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if result.returncode == 0 and result.stdout.strip():
|
|
return result.stdout.strip().removeprefix("v")
|
|
|
|
version_file = repo_root / "VERSION"
|
|
return version_file.read_text(encoding="utf-8").strip()
|