From 47a69da60869e737fb39e782c7c80624f87e00da Mon Sep 17 00:00:00 2001 From: CodeGonshik Date: Wed, 14 Oct 2026 16:00:27 +0300 Subject: [PATCH 1/2] feat: removed build executables --- brazier/CMakeLists.txt | 1 - brazier/CMakePresets.json | 113 ++++++++++++++++++++++++++++++++++++-- brazier/build.bat | 40 -------------- brazier/build.sh | 43 --------------- 4 files changed, 109 insertions(+), 88 deletions(-) delete mode 100644 brazier/build.bat delete mode 100644 brazier/build.sh diff --git a/brazier/CMakeLists.txt b/brazier/CMakeLists.txt index d6d620a..440ab30 100644 --- a/brazier/CMakeLists.txt +++ b/brazier/CMakeLists.txt @@ -103,7 +103,6 @@ target_include_directories(brazier_core_objects PUBLIC target_include_directories(brazier_core_objects PRIVATE ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/vendor ${CMAKE_SOURCE_DIR}/Database ${CMAKE_SOURCE_DIR}/Router ${CMAKE_SOURCE_DIR}/App diff --git a/brazier/CMakePresets.json b/brazier/CMakePresets.json index 54ac1d7..a451aeb 100644 --- a/brazier/CMakePresets.json +++ b/brazier/CMakePresets.json @@ -2,13 +2,118 @@ "version": 6, "configurePresets": [ { - "name": "brazier", - "displayName": "brazier", + "name": "windows-base", + "hidden": true, "generator": "Visual Studio 18 2026", - "binaryDir": "${sourceDir}/build", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "installDir": "${sourceDir}/out/install/${presetName}", "cacheVariables": { - "VCPKG_INSTALLED_DIR": "${sourceDir}/vcpkg_installed" + "CMAKE_C_COMPILER": "cl.exe", + "CMAKE_CXX_COMPILER": "cl.exe", + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_TARGET_TRIPLET": "x64-windows", + "BUILD_TESTS": "ON" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" } + }, + { + "name": "x64-debug", + "displayName": "x64 Debug", + "inherits": "windows-base", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + { + "name": "x64-release", + "displayName": "x64 Release", + "inherits": "x64-debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "x86-debug", + "displayName": "x86 Debug", + "inherits": "windows-base", + "architecture": { + "value": "x86", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "VCPKG_TARGET_TRIPLET": "x86-windows" + } + }, + { + "name": "x86-release", + "displayName": "x86 Release", + "inherits": "x86-debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "linux-debug", + "displayName": "Linux Debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "installDir": "${sourceDir}/out/install/${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_TARGET_TRIPLET": "x64-linux", + "BUILD_TESTS": "ON" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "macos-debug", + "displayName": "macOS Debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "installDir": "${sourceDir}/out/install/${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", + "VCPKG_TARGET_TRIPLET": "arm64-osx", + "BUILD_TESTS": "ON" + }, + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + } + ], + "buildPresets": [ + { + "name": "x64-debug", + "configurePreset": "x64-debug" + }, + { + "name": "x64-release", + "configurePreset": "x64-release" + }, + { + "name": "linux-debug", + "configurePreset": "linux-debug" + }, + { + "name": "macos-debug", + "configurePreset": "macos-debug" } ] } \ No newline at end of file diff --git a/brazier/build.bat b/brazier/build.bat deleted file mode 100644 index c0964ba..0000000 --- a/brazier/build.bat +++ /dev/null @@ -1,40 +0,0 @@ -:: SPDX-License-Identifier: LGPL-3.0-or-later -@echo off -chcp 65001 >nul -setlocal enabledelayedexpansion - -set PROJECT_NAME=brazier -set BUILD_DIR=build -set SOURCE_DIR=%~dp0 -set CONFIG=Release -if defined VCPKG_ROOT ( - set VCPKG_TOOLCHAIN=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -) else ( - set VCPKG_TOOLCHAIN=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake -) - -if not exist "%BUILD_DIR%" ( - mkdir "%BUILD_DIR%" -) - -cd /d "%BUILD_DIR%" - -if exist "%PROJECT_NAME%.exe" ( - ren "%PROJECT_NAME%.exe" "%PROJECT_NAME%_OLD.exe" -) - -cmake --preset brazier -A x64 -DBUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE="%VCPKG_TOOLCHAIN%" %SOURCE_DIR% -cmake --build . --config %CONFIG% --parallel -if %errorlevel% neq 0 ( - echo CMake build failed. - exit /b %errorlevel% -) - -if exist "%CONFIG%\%PROJECT_NAME%.exe" ( - echo Running %PROJECT_NAME%.exe... - "%CONFIG%\%PROJECT_NAME%.exe" -) else ( - echo The file %PROJECT_NAME%.exe was not found. -) - -cd /d "%SOURCE_DIR%" \ No newline at end of file diff --git a/brazier/build.sh b/brazier/build.sh deleted file mode 100644 index 95eefd9..0000000 --- a/brazier/build.sh +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-later -set -e - -PROJECT_NAME="brazier" -BUILD_DIR="build" -CONFIG="Release" -SOURCE_DIR="$(pwd)" -VCPKG_TOOLCHAIN="${VCPKG_TOOLCHAIN:-$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake}" -if [ ! -f "$VCPKG_TOOLCHAIN" ]; then - echo "vcpkg toolset not found: $VCPKG_TOOLCHAIN" - exit 1 -fi - -mkdir -p "$BUILD_DIR" -cd "$BUILD_DIR" - -if [ -f "$PROJECT_NAME" ]; then - mv "./$PROJECT_NAME" "./${PROJECT_NAME}_OLD" -fi - -cmake -DCMAKE_TOOLCHAIN_FILE="$VCPKG_TOOLCHAIN" -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=$CONFIG "$SOURCE_DIR" -cmake --build . --config $CONFIG --parallel -if [ $? -ne 0 ]; then - echo "Build failed" - exit -fi - -if [ -d "$SOURCE_DIR" ]; then - mkdir -p "$SOURCE_DIR/build/$CONFIG" - cp "$SOURCE_DIR/.env" "$SOURCE_DIR/build/$CONFIG/" - if [ $? -eq 0 ]; then - echo "Copied .env to $CONFIG." - fi -fi - -if [ -f "$PROJECT_NAME" ]; then - echo "Launch $PROJECT_NAME..." - ./"$PROJECT_NAME" -else - echo "Binary $PROJECT_NAME not found" -fi - -cd "$SOURCE_DIR" From 757ef18ad83ad727551dbee8d6b11c7e8915fb0a Mon Sep 17 00:00:00 2001 From: CodeGonshik Date: Wed, 14 Oct 2026 16:07:55 +0300 Subject: [PATCH 2/2] fix: replacing the generator with a more cross-platform one --- brazier/CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brazier/CMakePresets.json b/brazier/CMakePresets.json index a451aeb..b11f22f 100644 --- a/brazier/CMakePresets.json +++ b/brazier/CMakePresets.json @@ -4,7 +4,7 @@ { "name": "windows-base", "hidden": true, - "generator": "Visual Studio 18 2026", + "generator": "Ninja", "binaryDir": "${sourceDir}/out/build/${presetName}", "installDir": "${sourceDir}/out/install/${presetName}", "cacheVariables": {