mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 18:08:16 +00:00
Code Issues Releases Wiki Activity

[#3732] Switch meson.sh from venv to pyinstall to avoid venv depdendency when packaging

Browse Source
This commit is contained in:
Andrei Pavel 2025-03-26 08:34:29 +02:00
parent 97968ebebb
commit c450d69768
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
1 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meson.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -eu
# Pulls the latest meson that has fix https://github.com/mesonbuild/meson/pull/13532 # Pulls the latest meson that has fix https://github.com/mesonbuild/meson/pull/13532
# for issue https://github.com/mesonbuild/meson/issues/11322. # for issue https://github.com/mesonbuild/meson/issues/11322.
# #
@ -19,7 +21,16 @@ lt() {
return 0 return 0
} }
if test ! -d venv; then # Change directory to Kea's top level directory.
top_level=$(cd "$(dirname "${0}")" && pwd)
cd "${top_level}" || exit 1
if command -v meson > /dev/null 2>&1 && lt 1.7.98 "$(meson --version)"; then
# Good to be used. Does not suffer from endless transitional dependency iteration.
meson='meson'
else
meson='./.meson/meson'
if test ! -f "${meson}"; then
# Starting with Meson 0.62, Python 3.7 is required. # Starting with Meson 0.62, Python 3.7 is required.
python3=python3 python3=python3
v=$(python3 -c 'import platform; print(platform.python_version())') v=$(python3 -c 'import platform; print(platform.python_version())')
@ -38,16 +49,31 @@ if test ! -d venv; then
v=$("${python3}" -c 'import platform; print(platform.python_version())') v=$("${python3}" -c 'import platform; print(platform.python_version())')
printf 'Python version: %s\n' "${v}" printf 'Python version: %s\n' "${v}"
"${python3}" -m venv ./venv git clone https://github.com/mesonbuild/meson .meson-src
./venv/bin/pip install --upgrade pip (
cd .meson-src || exit 1
if git tag -l | grep -E '^1.8.0$' > /dev/null 2>&1; then
git checkout 1.8.0
fi
)
# When meson 1.8 will be released, we can pin the versions. "${python3}" -m venv ./.venv
./venv/bin/pip install git+https://github.com/mesonbuild/meson.git ./.venv/bin/pip install --upgrade pip
./venv/bin/pip install ninja
./.venv/bin/pip install ninja
./.venv/bin/pip install pyinstaller
(
cd .meson-src || exit 1
"${top_level}/.venv/bin/pyinstaller" --additional-hooks-dir=packaging --clean --dist "${top_level}/.meson" --onefile ./meson.py
)
cp ./.venv/bin/ninja ./.meson/ninja
rm -fr ./.meson-src ./.venv
fi
fi fi
# shellcheck disable=SC1091 if test -f "${top_level}/.meson/ninja"; then
# SC1091: Not following: ... was not specified as input (see shellcheck -x). # To find ninja in case it went with the pyinstalled version.
. ./venv/bin/activate export PATH="${top_level}/.meson:${PATH}"
fi
meson "${@}" "${meson}" "${@}"