From 442bb5db7ea79d29073b81049e3e3e660f4f9412 Mon Sep 17 00:00:00 2001 From: csh Date: Sun, 21 Dec 2025 17:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20align=20scripts=20with?= =?UTF-8?q?=20kept=20build=20dirs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lsp-server/conanfile.txt | 15 +++++++++++---- lsp-server/test/test_ast/test.sh | 4 ++-- lsp-server/test/test_semantic/test.sh | 2 +- lsp-server/test/test_symbol/test.sh | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lsp-server/conanfile.txt b/lsp-server/conanfile.txt index e7c5717..ba47c90 100644 --- a/lsp-server/conanfile.txt +++ b/lsp-server/conanfile.txt @@ -16,7 +16,14 @@ fmt/*:header_only=True [layout] cmake_layout -# 使用 Clang+libc++ 构建: -# CONAN_HOME=/tmp/conan-home conan install . -pr:h=conan/profiles/linux-x86_64-clang -pr:b=conan/profiles/linux-x86_64-clang -of build/clang --build=missing -# cmake -S . -B build/clang -DCMAKE_TOOLCHAIN_FILE=$PWD/build/clang/Release/generators/conan_toolchain.cmake -DBUILD_TESTS=ON -# cmake --build build/clang --target tsl-server +# 使用 Clang+libc++ 构建(Ninja generator): +# +# Linux 环境(build/clang-linux): +# CONAN_HOME=/tmp/conan-home conan install . -pr:h=conan/profiles/linux-x86_64-clang -pr:b=conan/profiles/linux-x86_64-clang -of build/clang-linux --build=missing +# cmake -S . -B build/clang-linux/Release -DCMAKE_TOOLCHAIN_FILE=$PWD/build/clang-linux/Release/generators/conan_toolchain.cmake -DBUILD_TESTS=ON +# cmake --build build/clang-linux/Release --target tsl-server +# +# 跨平台开发(build/clang-ninja): +# CONAN_HOME=/tmp/conan-home conan install . -pr:h=conan/profiles/linux-x86_64-clang -pr:b=conan/profiles/linux-x86_64-clang -of build/clang-ninja --build=missing +# cmake -S . -B build/clang-ninja -DCMAKE_TOOLCHAIN_FILE=$PWD/build/clang-ninja/Release/generators/conan_toolchain.cmake -DBUILD_TESTS=ON +# cmake --build build/clang-ninja --target tsl-server diff --git a/lsp-server/test/test_ast/test.sh b/lsp-server/test/test_ast/test.sh index 76690db..50da13b 100644 --- a/lsp-server/test/test_ast/test.sh +++ b/lsp-server/test/test_ast/test.sh @@ -12,8 +12,8 @@ NC='\033[0m' # No Color SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" -# 指定 build 预设(默认 codex,可通过 BUILD_PRESET 或 --preset 覆盖) -BUILD_PRESET=${BUILD_PRESET:-codex} +# 指定 build 预设(默认 clang-ninja,可通过 BUILD_PRESET 或 --preset 覆盖) +BUILD_PRESET=${BUILD_PRESET:-clang-ninja} IGNORES=("IDS_AuditExpr.tsf") find_test_ast() { diff --git a/lsp-server/test/test_semantic/test.sh b/lsp-server/test/test_semantic/test.sh index 738de8c..3f0d3d7 100644 --- a/lsp-server/test/test_semantic/test.sh +++ b/lsp-server/test/test_semantic/test.sh @@ -11,7 +11,7 @@ NC='\033[0m' # No Color # 路径与默认配置 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" -BUILD_PRESET=${BUILD_PRESET:-clang} +BUILD_PRESET=${BUILD_PRESET:-clang-ninja} IGNORES=("IDS_AuditExpr.tsf") find_test_semantic() { diff --git a/lsp-server/test/test_symbol/test.sh b/lsp-server/test/test_symbol/test.sh index 0df53fa..c10c90d 100644 --- a/lsp-server/test/test_symbol/test.sh +++ b/lsp-server/test/test_symbol/test.sh @@ -22,7 +22,7 @@ find_test_symbol() { find "$search_dir" -type f -name test_symbol -path "*/test/test_symbol/*" -print -quit 2>/dev/null } -BUILD_PRESET=${BUILD_PRESET:-codex} +BUILD_PRESET=${BUILD_PRESET:-clang-ninja} TEST_SYMBOL="${TEST_SYMBOL_OVERRIDE:-$(find "$REPO_ROOT/build/$BUILD_PRESET" -type f -name test_symbol -path "*/test/test_symbol/*" -print -quit 2>/dev/null)}" IGNORES=("IDS_AuditExpr.tsf")