From 1fc7aeb12a9d7a952740015276d5932052cb1623 Mon Sep 17 00:00:00 2001 From: "KOKO\\Mimi" Date: Sat, 17 Oct 2026 22:24:07 +0900 Subject: [PATCH] chore(build): move generated outputs out of harness --- .gitignore | 14 -------------- CMakePresets.json | 4 ++-- Doxyfile | 2 +- tests/test_cpp_policy_contract.py | 4 ++-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 87f4e46..ba1bef0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,20 +20,6 @@ __pycache__/ *.h5 .worktrees/ -# local Harness configuration and build outputs -.harness/config.json -.harness/build/ -.harness/build-ninja-msvc-debug/ -.harness/build-ninja-msvc-debug-english/ -.harness/build-ninja-msvc-debug-prefix/ -.harness/build-ninja-msvc-debug-lazy/ -.harness/build-ninja-msvc-release-lazy/ -.harness/build-ninja-msvc-release-prefix-cl/ -.harness/build-ninja-msvc-release/ -.harness/performance/ -.harness/doxygen/ -.harness/hook-state/ - # phase execution outputs phases/**/phase*-output.json phases/**/step*-output.json diff --git a/CMakePresets.json b/CMakePresets.json index fd20d76..7074f53 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,7 +5,7 @@ "name": "windows-msvc-ninja-debug", "displayName": "Windows MSVC x64 Debug (Ninja)", "generator": "Ninja", - "binaryDir": "${sourceDir}/.harness/build-ninja-msvc-debug", + "binaryDir": "${sourceDir}/build/windows-msvc-ninja-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "FESA_GTEST_SOURCE_DIR": "$env{FESA_GTEST_SOURCE_DIR}", @@ -18,7 +18,7 @@ "name": "windows-msvc-ninja-release", "displayName": "Windows MSVC x64 Release with symbols (Ninja)", "inherits": "windows-msvc-ninja-debug", - "binaryDir": "${sourceDir}/.harness/build-ninja-msvc-release", + "binaryDir": "${sourceDir}/build/windows-msvc-ninja-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } diff --git a/Doxyfile b/Doxyfile index b24754a..d4ba0e1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,6 +1,6 @@ PROJECT_NAME = FESA PROJECT_NUMBER = 0.1.0 -OUTPUT_DIRECTORY = .harness/doxygen +OUTPUT_DIRECTORY = build/doxygen INPUT = include src EXCLUDE = tests RECURSIVE = YES diff --git a/tests/test_cpp_policy_contract.py b/tests/test_cpp_policy_contract.py index f3935c4..a303fed 100644 --- a/tests/test_cpp_policy_contract.py +++ b/tests/test_cpp_policy_contract.py @@ -66,11 +66,11 @@ def test_p_style_001_cpp_style_and_doxygen_tooling_contract(): assert doxyfile["INPUT"].split() == ["include", "src"] assert doxyfile["EXCLUDE"].split() == ["tests"] assert doxyfile["WARN_AS_ERROR"] == "YES" - assert doxyfile["OUTPUT_DIRECTORY"] == ".harness/doxygen" + assert doxyfile["OUTPUT_DIRECTORY"] == "build/doxygen" assert doxyfile["HTML_OUTPUT"] == "html" gitignore_lines = read(ROOT / ".gitignore").splitlines() - assert ".harness/doxygen/" in gitignore_lines + assert "build/" in gitignore_lines cmake = read(ROOT / "CMakeLists.txt") assert "find_package(Doxygen QUIET)" in cmake