From a2136f5367004196b40434d274a99c7cf278d053 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Tue, 14 Apr 2026 23:14:17 +0200 Subject: [PATCH] Remove tools, they will be their own packages --- .gitea/workflows/ci.yml | 4 +--- .gitea/workflows/sonarqube.yml | 2 -- CMake/FindDependencies.cmake | 8 -------- CMakeLists.txt | 1 - README.md | 3 +-- conanfile.py | 15 --------------- generate_dependencies.bat | 6 +++--- generate_dependencies.sh | 12 ++++++------ 8 files changed, 11 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 23af09c..9ceec91 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -45,7 +45,6 @@ jobs: -s build_type=$build_type \ -o bigfoot/*:build_tests=True \ -o bigfoot/*:tracy=False \ - -o bigfoot/*:build_tools=True \ -o bigfoot/*:vulkan=True done conan install . --remote=bigfootpackages \ @@ -54,7 +53,6 @@ jobs: -s build_type=$build_type \ -o bigfoot/*:build_tests=True \ -o bigfoot/*:tracy=False \ - -o bigfoot/*:build_tools=True \ -o bigfoot/*:vulkan=True - name: Show ccache stats @@ -95,7 +93,7 @@ jobs: - name: Build run: | - conan install . --remote=bigfootpackages -pr:h=${{ matrix.conan_profile }} -pr:b=${{ matrix.conan_profile }} --build=never -s build_type=${{ matrix.build_type }} -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=False -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=${{ matrix.conan_profile }} -pr:b=${{ matrix.conan_profile }} --build=never -s build_type=${{ matrix.build_type }} -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=False -o bigfoot/*:vulkan=True cmake -S . -B ./build/${{ matrix.build_type }} --toolchain ./build/${{ matrix.build_type }}/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_UNITY_BUILD=${{ matrix.unity_build }} -G "Ninja" cmake --build build/${{ matrix.build_type }} --parallel $(nproc) diff --git a/.gitea/workflows/sonarqube.yml b/.gitea/workflows/sonarqube.yml index 7d021a0..ceb7c4d 100644 --- a/.gitea/workflows/sonarqube.yml +++ b/.gitea/workflows/sonarqube.yml @@ -44,7 +44,6 @@ on: -s build_type=$build_type \ -o bigfoot/*:build_tests=True \ -o bigfoot/*:tracy=False \ - -o bigfoot/*:build_tools=True \ -o bigfoot/*:vulkan=True done conan install . --remote=bigfootpackages \ @@ -53,7 +52,6 @@ on: -s build_type=$build_type \ -o bigfoot/*:build_tests=True \ -o bigfoot/*:tracy=False \ - -o bigfoot/*:build_tools=True \ -o bigfoot/*:vulkan=True - name: Show ccache stats diff --git a/CMake/FindDependencies.cmake b/CMake/FindDependencies.cmake index 3083614..09b0956 100644 --- a/CMake/FindDependencies.cmake +++ b/CMake/FindDependencies.cmake @@ -53,12 +53,4 @@ endif() if(BUILD_TESTS) find_package(GTest REQUIRED) find_package(pixelmatch-cpp17 REQUIRED) -endif() - -if(BUILD_TOOLS) - find_package(spirv-cross REQUIRED) - find_package(shaderc REQUIRED) - find_package(assimp REQUIRED) - find_package(meshoptimizer REQUIRED) - find_package(libsquish REQUIRED) endif() \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c7e12e1..a2cccc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,6 @@ option(BUILD_TESTS OFF) option(ASAN OFF) option(COVERAGE OFF) option(TRACY ON) -option(BUILD_TOOLS ON) option(VULKAN ON) set(AUTO_GENERATED_COMMENT "// AUTO-GENERATED DO NOT TOUCH") diff --git a/README.md b/README.md index 17501e6..76bac37 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,7 @@ You can customize these scripts to opt-out of some Bigfoot features 1. build_tests: Enable/Disable the tests 2. tracy: Enable/Disable profiling using [Tracy](https://github.com/wolfpld/tracy) -3. build_tools: Enable/Disable the tools (I'd absolutely recommand not disabling this) -4. vulkan: Enable/Disable Vulkan renderer (No point disabling it, since for now only Vulkan is available in Bigfoot) +3. vulkan: Enable/Disable Vulkan renderer (No point disabling it, since for now only Vulkan is available in Bigfoot) ### Generating Bigfoot diff --git a/conanfile.py b/conanfile.py index 825f818..3441d4c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -22,7 +22,6 @@ class Bigfoot(ConanFile): "coverage": [True, False], "build_tests": [True, False], "tracy": [True, False], - "build_tools": [True, False], "vulkan": [True, False] } default_options = { @@ -32,7 +31,6 @@ class Bigfoot(ConanFile): "coverage": False, "build_tests": False, "tracy": False, - "build_tools": True, "vulkan": True, } @@ -56,10 +54,6 @@ class Bigfoot(ConanFile): if(self.options.vulkan): self.options["spirv-cross"].exceptions = False - - if(self.options.build_tools): - self.options["assimp"].with_ifc = False - self.options["pugixml"].no_exceptions = True def build_requirements(self): self.tool_requires("bin2cpp/1.0.0@bigfootdev/main") @@ -99,14 +93,6 @@ class Bigfoot(ConanFile): self.test_requires("gtest/1.17.0") self.test_requires("pixelmatch-cpp17/1.0.3@bigfootdev/main") - if(self.options.build_tools): - self.requires("spirv-cross/1.4.341.0@bigfootdev/main") - self.requires("shaderc/2026.1@bigfootdev/main") - self.requires("stb/cci.20240531", override=True) - self.requires("assimp/6.0.4@bigfootdev/main") - self.requires("meshoptimizer/1.0@bigfootdev/main") - self.requires("libsquish/1.15") - def generate(self): tc = CMakeToolchain(self) @@ -114,7 +100,6 @@ class Bigfoot(ConanFile): tc.variables["COVERAGE"] = self.options.coverage tc.variables["BUILD_TESTS"] = self.options.build_tests tc.variables["TRACY"] = self.options.tracy - tc.variables["BUILD_TOOLS"] = self.options.build_tools tc.variables["VULKAN"] = self.options.vulkan tc.generate() diff --git a/generate_dependencies.bat b/generate_dependencies.bat index de6495c..0daf111 100644 --- a/generate_dependencies.bat +++ b/generate_dependencies.bat @@ -23,8 +23,8 @@ REM Add the remote conan remote add bigfootpackages https://conan.romainboullard.com/artifactory/api/conan/BigfootPackages REM Install dependencies with the specified build option -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/msvc %build_option% -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True endlocal diff --git a/generate_dependencies.sh b/generate_dependencies.sh index 61c70d0..7f01e9d 100644 --- a/generate_dependencies.sh +++ b/generate_dependencies.sh @@ -11,13 +11,13 @@ conan remote add bigfootpackages https://conan.romainboullard.com/artifactory/ap # Set the build option based on the argument if [ "$1" == "force" ]; then - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build='*' -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True elif [ "$1" == "missing" ]; then - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True - conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:build_tools=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True + conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/clang -pr:b=./ConanProfiles/clang --build=missing -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True else echo "Invalid argument: $1" echo "Usage: $0 [force|missing]"