From 6cba8b7c64989e31e3a1ea1dcd625ed053b7d3b5 Mon Sep 17 00:00:00 2001 From: tooomm Date: Mon, 27 Jul 2026 11:08:29 +0200 Subject: [PATCH] cpack debug --- .ci/compile.sh | 24 +++++++++++++++++++++--- .ci/lint_cpp.sh | 2 -- format.sh | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index ef895e51f..b7ef3c770 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -328,10 +328,14 @@ if [[ $USE_CCACHE == 1 ]]; then ccache --show-stats ccache --show-compression echo " -----" + ccache --show-stats --verbose + ccache --show-compression + echo " -----" ccache --zero-stats echo " -----" ccache --show-stats - ccache --show-compression + echo " -----" + ccache --show-stats --verbose echo "::endgroup::" fi @@ -339,7 +343,7 @@ fi ### Build # Configure CMake -echo "::group::Configure CMake" +echo "::group::Generate buildsystem" cmake --version echo "Running CMake configuration with following flags: ${flags[*]}" cmake -S . -B "$BUILD_DIR" "${flags[@]}" @@ -405,9 +409,23 @@ fi # Package if [[ $MAKE_PACKAGE == 1 ]]; then + echo "::group::Debug NSIS / CPack" + cat "_CPack_Packages/win64/NSIS/NSISOutput.log" + echo " -----" + find . -name "NSIS.definitions.nsh" + find "$BUILD_DIR" -name "NSIS.definitions.nsh" + ls -l "$BUILD_DIR/NSIS.definitions.nsh" + echo "::endgroup:" + echo "::group::Create package" cpack --version - cpack --config "$BUILD_DIR/CPackConfig.cmake" + ( + cd "$BUILD_DIR" + cpack + ) + # cpack --config "$BUILD_DIR/CPackConfig.cmake" + # cmake --build "$BUILD_DIR" --target package + #TODO included --config? compare with former isntall and other --target variants used echo "::endgroup::" if [[ -n $PACKAGE_SUFFIX ]]; then diff --git a/.ci/lint_cpp.sh b/.ci/lint_cpp.sh index c28329dbe..b934c0307 100755 --- a/.ci/lint_cpp.sh +++ b/.ci/lint_cpp.sh @@ -32,7 +32,6 @@ case $err in *** *** *********************************************************** -Exiting... EOM exit 2 ;; @@ -48,7 +47,6 @@ EOM *** *** *********************************************************** -Exiting... EOM exit 0 ;; diff --git a/format.sh b/format.sh index 01239479b..b174bea2f 100755 --- a/format.sh +++ b/format.sh @@ -14,7 +14,7 @@ cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with # Defaults include=("cockatrice/src" \ -libcockatrice_* \ + libcockatrice_* \ "oracle/src" \ "servatrice/src" \ "tests")