Use proper names for source and binary packages

Source package: ccache-$VERSION.tar.xz (and .tar.gz)
Binary package: ccache-$VERSION-$OS-$PROCESSOR.tar.xz (or .zip)

diff --git a/ci/build-and-verify-package b/ci/build-and-verify-package
index 3dfffa8fc154471c26724f64515b78ab08b59cfe..4e8ff8c561114ca42b5e9bd4ccd7fe20849b26d1 100755 (executable)
--- a/ci/build-and-verify-package
+++ b/ci/build-and-verify-package
@@ -8,12 +8,10 @@ cd build_package_dir_test
 cmake ..
 cmake --build . --target package
 
-# get out of git directory just to be sure
+# Get out of git directory just to be sure.
 tmp_dir=$(mktemp -d)
 trap "rm -rf $tmp_dir" EXIT
 
-tar -xzf ccache-binary.tar.gz -C $tmp_dir
+tar -xf ccache-*.tar.xz -C $tmp_dir
 
-CCACHE=$tmp_dir/ccache-binary/bin/ccache ../test/run
-
-echo "Binary package is fine and can be used."
+CCACHE=$(echo $tmp_dir/ccache-*/bin/ccache) ../test/run

diff --git a/ci/build-and-verify-package-source b/ci/build-and-verify-package-source
index 69152dfa3ecdb473ddd5e41574f0dd4ca6fa3d00..4ef2d75f8d1c43ace7c46f8a89de1e81de3767c3 100755 (executable)
--- a/ci/build-and-verify-package-source
+++ b/ci/build-and-verify-package-source
@@ -8,18 +8,12 @@ cd build_package_source_dir_test
 cmake ..
 cmake --build . --target package_source
 
-# get out of git directory
-# Unfortunately this random name will prevent ccache from caching results...
-# TODO: use '../../temp' instead?
 tmp_dir=$(mktemp -d)
 trap "rm -rf $tmp_dir" EXIT
 
-tar -xf ccache-src.tar.gz -C $tmp_dir
-cd $tmp_dir/ccache-src
+tar -xf ccache-*.tar.xz -C $tmp_dir
+cd $tmp_dir/ccache-*
 
 cmake .
 cmake --build . -- -j4
 ctest --output-on-failure -j4
-
-echo "Source package is fine and can be used."
-

diff --git a/cmake/CcachePackConfig.cmake b/cmake/CcachePackConfig.cmake
index e5d4201089b482d38f7d3a383c82eae0c8222ec8..601a1a77370d41dabe293f164a580bfb90b67250 100644 (file)
--- a/cmake/CcachePackConfig.cmake
+++ b/cmake/CcachePackConfig.cmake
@@ -22,7 +22,10 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "^${CMAKE_SOURCE_DIR}/\\.git")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "^${CMAKE_SOURCE_DIR}/build")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "^${CMAKE_BINARY_DIR}")
 
-set(CPACK_PACKAGE_FILE_NAME "ccache-binary")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "ccache-src")
+set(
+  CPACK_PACKAGE_FILE_NAME
+  "ccache-${VERSION}-${CMAKE_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}"
+)
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "ccache-${VERSION}")
 
 include(CPack)