CI: use PROJ_DB_CACHE_DIR (OSGeo#3717)

Author: mwtoews

.github/workflows/clang_linux/start.sh

@@ -22,8 +22,6 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then
     (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
 fi
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 ccache -M 500M
 
 # -fno-use-cxa-atexit is needed to build with -coverage

.github/workflows/linux_gcc_32bit/start.sh

@@ -38,8 +38,6 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then
     (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
 fi
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 ccache -M 500M
 
 CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh

.github/workflows/linux_gcc_5_4/start.sh

@@ -30,8 +30,6 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then
     (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
 fi
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 ccache -M 500M
 
 CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh

.github/workflows/mac/install.sh

@@ -2,8 +2,6 @@
 
 set -e
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 ccache -M 200M
 
 CC="clang" CXX="clang++" CFLAGS="-Werror" CXXFLAGS="-Werror" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh

.github/workflows/mingw_w64/start.sh

@@ -28,8 +28,6 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then
     (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
 fi
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 sudo apt-get install -y --no-install-recommends \
     binutils-mingw-w64-x86-64 \
     gcc-mingw-w64-x86-64 \
@@ -110,6 +108,7 @@ cmake -G "Unix Makefiles" \
     -D ENABLE_CURL=OFF \
     -D BUILD_PROJSYNC=OFF \
     -D USE_CCACHE=ON \
+    -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
     ..
 make
 # Run a subset of tests that should pass

.github/workflows/windows.yml

@@ -54,12 +54,14 @@ jobs:
             set VCPKG_INSTALLED=c:\vcpkg\installed\${{ env.ARCH }}-windows
             dir %VCPKG_INSTALLED%\bin
             dir %VCPKG_INSTALLED%\tools
+            set PROJ_DB_CACHE_DIR=%VCPKG_INSTALLED%\cache
+            mkdir %PROJ_DB_CACHE_DIR%
             set PATH=%VCPKG_INSTALLED%\bin;%VCPKG_INSTALLED%\tools;%PATH%
             set PROJ_BUILD=%GITHUB_WORKSPACE%\build
             mkdir %PROJ_BUILD%
             cd %PROJ_BUILD%
             set PROJ_DIR=%GITHUB_WORKSPACE%\proj_dir
-            cmake -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" -DBUILD_SHARED_LIBS="${{ env.BUILD_SHARED_LIBS }}" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%" ..
+            cmake -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" -DBUILD_SHARED_LIBS="${{ env.BUILD_SHARED_LIBS }}" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%" -DPROJ_DB_CACHE_DIR=%PROJ_DB_CACHE_DIR% ..
             ninja -v
             ninja install
             dir %PROJ_DIR%\bin
@@ -132,7 +134,7 @@ jobs:
             PROJ_DIR=${GITHUB_WORKSPACE}/proj_dir
             mkdir ${PROJ_BUILD}
             cd ${PROJ_BUILD}
-            cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }} -DCMAKE_INSTALL_PREFIX="${PROJ_DIR}" -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DUSE_CCACHE=ON ..
+            cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }} -DCMAKE_INSTALL_PREFIX="${PROJ_DIR}" -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DUSE_CCACHE=ON -DPROJ_DB_CACHE_DIR=$HOME/.ccache ..
             make -j 2
             make install
             ls ${PROJ_DIR}/bin

data/generate_proj_db.cmake

@@ -18,11 +18,11 @@ if(IS_DIRECTORY ${PROJ_DB_CACHE_DIR})
   set(USE_PROJ_DB_CACHE_DIR TRUE)
   set(PROJ_DB_SQL_MD5_FILE "${PROJ_DB_CACHE_DIR}/proj.db.sql.md5")
   if(EXISTS "${PROJ_DB_SQL_MD5_FILE}")
-    file(STRINGS "${PROJ_DB_SQL_MD5_FILE}" PROJ_DB_SQL_MD5 LIMIT_COUNT 1)
+    file(STRINGS "${PROJ_DB_SQL_MD5_FILE}" CACHED_PROJ_DB_SQL_MD5 LIMIT_COUNT 1)
   endif()
   file(MD5 "${ALL_SQL_IN}" PROJ_DB_SQL_MD5)
   set(CACHED_PROJ_DB "${PROJ_DB_CACHE_DIR}/proj.db")
-  if("${PROJ_DB_SQL_MD5}" STREQUAL "${PROJ_DB_SQL_MD5}" AND EXISTS "${CACHED_PROJ_DB}")
+  if("${PROJ_DB_SQL_MD5}" STREQUAL "${CACHED_PROJ_DB_SQL_MD5}" AND EXISTS "${CACHED_PROJ_DB}")
     message(STATUS "Reusing cached proj.db from ${PROJ_DB_CACHE_DIR}")
     get_filename_component(PROJ_DB_DIR "${PROJ_DB}" DIRECTORY)
     file(COPY "${CACHED_PROJ_DB}" DESTINATION "${PROJ_DB_DIR}")

travis/install.sh

@@ -56,6 +56,7 @@ cd shared_build
 cmake \
   -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
   -D USE_CCACHE=${USE_CCACHE} \
+  -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
   -D BUILD_SHARED_LIBS=ON \
   -D BUILD_EXAMPLES=ON \
   -D CMAKE_INSTALL_PREFIX=/tmp/proj_shared_install_from_dist \
@@ -94,6 +95,7 @@ cd static_build
 cmake \
   -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
   -D USE_CCACHE=${USE_CCACHE} \
+  -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
   -D BUILD_SHARED_LIBS=OFF \
   -D CMAKE_INSTALL_PREFIX=/tmp/proj_static_install_from_dist \
   -D CMAKE_INSTALL_INCLUDEDIR=/tmp/proj_static_install_from_dist/include \
@@ -228,7 +230,7 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
 
     mkdir build_cmake
     cd build_cmake
-    cmake -D USE_CCACHE=${USE_CCACHE} ..
+    cmake -D USE_CCACHE=${USE_CCACHE} -D PROJ_DB_CACHE_DIR=$HOME/.ccache ..
     make
 
     # return to root
@@ -245,13 +247,15 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
             cmake \
               -D CMAKE_BUILD_TYPE=Debug \
               -D USE_CCACHE=${USE_CCACHE} \
+              -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
               -D CMAKE_C_FLAGS="--coverage" \
               -D CMAKE_CXX_FLAGS="--coverage" \
               . ;
         else
             LDFLAGS="$LDFLAGS -lgcov" cmake \
               -D CMAKE_BUILD_TYPE=Debug \
               -D USE_CCACHE=${USE_CCACHE} \
+              -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
               -D CMAKE_C_FLAGS="$CFLAGS --coverage" \
               -D CMAKE_CXX_FLAGS="$CXXFLAGS --coverage" \
               . ;
@@ -260,6 +264,7 @@ if [ "$BUILD_NAME" != "linux_gcc8" -a "$BUILD_NAME" != "linux_gcc_32bit" ]; then
         cmake \
           -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
           -D USE_CCACHE=${USE_CCACHE} \
+          -D PROJ_DB_CACHE_DIR=$HOME/.ccache \
           . ;
     fi
     make

travis/linux_generic/install.sh

@@ -2,7 +2,5 @@
 
 set -e
 
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
 # -fno-use-cxa-atexit is needed to build with -coverage
 CFLAGS="-Werror" CXXFLAGS="-Werror" ./travis/install.sh