From a7ab2d4079e96c35db2da7c23dd572e0cbcee20d Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Mon, 11 Aug 2025 13:17:11 -0400 Subject: [PATCH] fix(build.py): fixed \ in f string parsing --- fourdst/core/build.py | 27 ++++++++++++++++++--------- meson.build | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/fourdst/core/build.py b/fourdst/core/build.py index 06a3f46..2cf017d 100644 --- a/fourdst/core/build.py +++ b/fourdst/core/build.py @@ -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 build_script = f""" set -e - echo \"--- Installing build dependencies ---\" - export PATH=\"/opt/python/cp313-cp313/bin:$PATH\" + echo "--- Installing build dependencies ---" + export PATH="/opt/python/cp313-cp313/bin:$PATH" dnf install -y openssl-devel pip install meson ninja cmake - echo \"--- Configuring with Meson ---\" + echo "--- Configuring with Meson ---" meson setup /build/meson_build - echo \"--- Compiling with Meson ---\" + echo "--- Compiling with Meson ---" meson compile -C /build/meson_build - echo \"--- Running ABI detector ---\" - mkdir /tmp/abi && cd /tmp/abi - echo \"{ABI_DETECTOR_CPP_SRC.replace('"', '\\"')}\" > main.cpp - echo \"{ABI_DETECTOR_MESON_SRC.replace('"', '\\"')}\" > meson.build + + echo "--- Running ABI detector ---" + mkdir -p /tmp/abi && cd /tmp/abi + + 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 ./build/detector > /build/abi_details.txt """ - + + container_build_dir = Path("/build") report_progress(" - Running build container...") diff --git a/meson.build b/meson.build index 8e35d29..106dd1e 100644 --- a/meson.build +++ b/meson.build @@ -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')