From 85734fb7b2988681e670ba0fc91ec34b6d7ef6cf Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 10 Aug 2025 12:46:46 +1200 Subject: [PATCH] config: Update 2 and remove 1 files --- CMakeLists.txt | 8 ++++---- Dockerfile.dropshell-build | 6 +++--- cmake_prebuild.sh | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100755 cmake_prebuild.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index efc8ccf..c79ac2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,10 +24,10 @@ add_executable(${PROJECT_NAME} ${SOURCES}) configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY) # Pre-build script -add_custom_target(run_prebuild_script ALL - COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -add_dependencies(${PROJECT_NAME} run_prebuild_script) +#add_custom_target(run_prebuild_script ALL +# COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh +# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +#add_dependencies(${PROJECT_NAME} run_prebuild_script) # Include directories target_include_directories(${PROJECT_NAME} PRIVATE diff --git a/Dockerfile.dropshell-build b/Dockerfile.dropshell-build index fe58a8d..9071e44 100644 --- a/Dockerfile.dropshell-build +++ b/Dockerfile.dropshell-build @@ -16,11 +16,11 @@ ENV CCACHE_COMPILERCHECK=content ENV CCACHE_MAXSIZE=2G # Copy only build files first (for better layer caching) -COPY CMakeLists.txt cmake_prebuild.sh ./ -COPY src/version.hpp.in src/ +#COPY CMakeLists.txt cmake_prebuild.sh ./ +#COPY src/version.hpp.in src/ # Run prebuild script early (this rarely changes) -RUN bash cmake_prebuild.sh +#RUN bash cmake_prebuild.sh # Copy source files (this invalidates cache when source changes) COPY src/ src/ diff --git a/cmake_prebuild.sh b/cmake_prebuild.sh deleted file mode 100755 index 62b287c..0000000 --- a/cmake_prebuild.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "cmake_prebuild.sh complete."