fix(build.py): fixed \ in f string parsing

This commit is contained in:
2025-08-11 13:17:11 -04:00
parent 57353ac502
commit a7ab2d4079
2 changed files with 19 additions and 10 deletions

View File

@@ -110,23 +110,32 @@ def build_plugin_in_docker(sdist_path: Path, build_dir: Path, target: dict, plug
from fourdst.core.platform import ABI_DETECTOR_CPP_SRC, ABI_DETECTOR_MESON_SRC from fourdst.core.platform import ABI_DETECTOR_CPP_SRC, ABI_DETECTOR_MESON_SRC
build_script = f""" build_script = f"""
set -e set -e
echo \"--- Installing build dependencies ---\" echo "--- Installing build dependencies ---"
export PATH=\"/opt/python/cp313-cp313/bin:$PATH\" export PATH="/opt/python/cp313-cp313/bin:$PATH"
dnf install -y openssl-devel dnf install -y openssl-devel
pip install meson ninja cmake pip install meson ninja cmake
echo \"--- Configuring with Meson ---\" echo "--- Configuring with Meson ---"
meson setup /build/meson_build meson setup /build/meson_build
echo \"--- Compiling with Meson ---\" echo "--- Compiling with Meson ---"
meson compile -C /build/meson_build meson compile -C /build/meson_build
echo \"--- Running ABI detector ---\"
mkdir /tmp/abi && cd /tmp/abi echo "--- Running ABI detector ---"
echo \"{ABI_DETECTOR_CPP_SRC.replace('"', '\\"')}\" > main.cpp mkdir -p /tmp/abi && cd /tmp/abi
echo \"{ABI_DETECTOR_MESON_SRC.replace('"', '\\"')}\" > meson.build
cat > main.cpp << 'EOF'
{ABI_DETECTOR_CPP_SRC}
EOF
cat > meson.build << 'EOF'
{ABI_DETECTOR_MESON_SRC}
EOF
meson setup build && meson compile -C build meson setup build && meson compile -C build
./build/detector > /build/abi_details.txt ./build/detector > /build/abi_details.txt
""" """
container_build_dir = Path("/build") container_build_dir = Path("/build")
report_progress(" - Running build container...") report_progress(" - Running build container...")

View File

@@ -1,4 +1,4 @@
project('fourdst', 'cpp', version: 'v0.6.2', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') project('fourdst', 'cpp', version: 'v0.6.3', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
add_project_arguments('-fvisibility=default', language: 'cpp') add_project_arguments('-fvisibility=default', language: 'cpp')