Merge branch 'master' into pr-test

.github/workflows/osgeo4w.yml

@@ -1,4 +1,4 @@
-name: OSGeo4W Windows Build Test
+name: OSGeo4W Windows Build
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -70,8 +70,7 @@ jobs:
     needs: osgeo4w-packages
     runs-on: windows-latest
     env:
-      O4W_REPO: jef-n/o4w-playground
-      # O4W_REPO: jef-n/OSGeo4W
+      O4W_REPO: jef-n/OSGeo4W
 
     strategy:
       matrix: ${{ fromJson(needs.osgeo4w-packages.outputs.matrix) }}
@@ -80,7 +79,7 @@ jobs:
       - name: Restore build cache
         uses: actions/cache/restore@v4
         with:
-          path: src/${{ matrix.pkg }}/osgeo4w/build
+          path: ccache
           key: build-ccache-osgeo4w-${{ matrix.pkg }}-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
             build-ccache-osgeo4w-${{ matrix.pkg }}
@@ -94,31 +93,26 @@ jobs:
           PKGDESC: "QGIS build of ${{ github.ref }}"
           OSGEO4W_BUILD_RDEPS: 0
           PATH: C:\WINDOWS\system32;C:\Windows
-          CCACHE_DIR: src/${{ matrix.pkg }}/osgeo4w/build/ccache
+          CCACHE_DIR: ${{ github.workspace }}/ccache
+          SITE: github.com
         run: |
           curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/%O4W_REPO%/master/bootstrap.cmd>bootstrap.cmd
           curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/%O4W_REPO%/master/bootstrap.sh>bootstrap.sh
 
-          assoc ShellScript=*.sh
-          ftype ShellScript=%GITHUB_WORKSPACE%\cygwin\bin\bash.exe %1 %*
-          assoc PythonScript=*.py
-          ftype PythonScript=%GITHUB_WORKSPACE%\src\%PKG%\osgeo4w\osgeo4w\bin\python3.exe %1 %*
-
           set O4W_GIT_REPO=%GITHUB_SERVER_URL%/%O4W_REPO%
           call bootstrap.cmd %PKG%
 
-          path
-          ccache -sv
+          %GITHUB_WORKSPACE%\scripts\ccache -sv
 
       - uses: actions/upload-artifact@v4
         with:
-          name: osgeo4w-repo
+          name: ${{ matrix.pkg }}
           path: x86_64/
           retention-days: 1
 
       - name: Save build cache for push only
         uses: actions/cache/save@v4
         if: ${{ github.event_name == 'push' }}
         with:
-          path: src/${{ matrix.pkg }}/osgeo4w/build
+          path: ccache
           key: build-ccache-osgeo4w-${{ matrix.pkg }}-${{ github.ref_name }}-${{ github.run_id }}

.gitignore

@@ -44,20 +44,6 @@ desktop.ini
 doc/INSTALL.tex
 i18n/*.qm
 ms-windows/*.exe*
-ms-windows/Installer-Files/postinstall.bat
-ms-windows/Installer-Files/preremove.bat
-ms-windows/nsis/
-ms-windows/osgeo4w/addons/
-ms-windows/osgeo4w/binary-*
-ms-windows/osgeo4w/build-*
-ms-windows/osgeo4w/nsis/
-ms-windows/osgeo4w/packages-x86/
-ms-windows/osgeo4w/packages-x86_64/
-ms-windows/osgeo4w/unpacked/
-ms-windows/osgeo4w/untgz/
-ms-windows/packages/
-ms-windows/progs/
-ms-windows/untgz/
 python/plugins/grassprovider/description/algorithms.json
 python/plugins/grassprovider/tests/testdata/directions.tif.aux.xml
 python/plugins/processing/tests/testdata/*.aux.xml

CMakeLists.txt

@@ -19,6 +19,13 @@ endif()
 # don't relink it only the shared object changes
 set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
 
+set (WITH_BINDINGS TRUE CACHE BOOL "Determines whether Python bindings should be built")
+set (WITH_3D TRUE CACHE BOOL "Determines whether QGIS 3D library should be built")
+set (WITH_QGIS_PROCESS TRUE CACHE BOOL "Determines whether the standalone \"qgis_process\" tool should be built")
+set (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
+set (WITH_GUI TRUE CACHE BOOL "Determines whether QGIS GUI library should be built")
+
+
 #############################################################
 # Project and version
 set(CPACK_PACKAGE_VERSION_MAJOR "3")
@@ -85,17 +92,15 @@ if (USE_OPENCL)
 endif()
 
 # Configure CCache if available
-if(NOT MSVC)
-  option(USE_CCACHE "Use ccache" ON)
-  if (USE_CCACHE)
-    find_program(CCACHE_FOUND ccache)
-    if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-        message(STATUS "ccache found")
-    endif(CCACHE_FOUND)
-  endif(USE_CCACHE)
-endif(NOT MSVC)
+option(USE_CCACHE "Use ccache" ON)
+if (USE_CCACHE)
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+    message(STATUS "ccache found")
+  endif(CCACHE_FOUND)
+endif(USE_CCACHE)
 
 if (IOS)
     set (DEFAULT_FORCE_STATIC_LIBS TRUE)
@@ -140,8 +145,6 @@ if(WITH_CORE)
     endif()
   endforeach (GRASS_SEARCH_VERSION)
 
-  set (WITH_GUI TRUE CACHE BOOL "Determines whether QGIS GUI library (and everything built on top of it) should be built")
-
   set (WITH_OAUTH2_PLUGIN TRUE CACHE BOOL "Determines whether OAuth2 authentication method plugin should be built")
   if(WITH_OAUTH2_PLUGIN)
     set(HAVE_OAUTH2_PLUGIN TRUE)
@@ -151,8 +154,6 @@ if(WITH_CORE)
 
   set (WITH_ANALYSIS TRUE CACHE BOOL "Determines whether QGIS analysis library should be built")
 
-  set (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
-
   if(WITH_DESKTOP)
       if((WIN32 AND NOT MINGW) OR (UNIX AND NOT APPLE AND NOT ANDROID AND NOT IOS))
 	set (CRASH_HANDLER_AVAILABLE TRUE)
@@ -171,17 +172,13 @@ if(WITH_CORE)
       endif()
   endif()
 
-  set (WITH_3D TRUE CACHE BOOL "Determines whether QGIS 3D library should be built")
 
   set (WITH_QUICK FALSE CACHE BOOL "Determines whether QGIS Quick library should be built")
 
-  set (WITH_QGIS_PROCESS TRUE CACHE BOOL "Determines whether the standalone \"qgis_process\" tool should be built")
-
   set (NATIVE_CRSSYNC_BIN "" CACHE PATH "Path to a natively compiled synccrsdb binary. If set, crssync will not build but use provided bin instead.")
   mark_as_advanced (NATIVE_CRSSYNC_BIN)
 
   # try to configure and build python bindings by default
-  set (WITH_BINDINGS TRUE CACHE BOOL "Determines whether Python bindings should be built")
   if (WITH_BINDINGS)
     # By default bindings will be installed only to QGIS directory
     # Someone might want to install it to python site-packages directory
@@ -638,8 +635,8 @@ if (ENABLE_TESTS)
   add_custom_target(check COMMAND xvfb-run --server-args=-screen\ 0\ 1024x768x24 ctest --output-on-failure)
 
   # Define SOURCETREE fixture
-  add_test(NAME   logGitStatus COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/chkgitstatus.sh log)
-  add_test(NAME checkGitStatus COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/chkgitstatus.sh check)
+  add_test(NAME   logGitStatus COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/scripts/chkgitstatus.sh log)
+  add_test(NAME checkGitStatus COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/scripts/chkgitstatus.sh check)
   set_tests_properties(logGitStatus   PROPERTIES FIXTURES_SETUP   SOURCETREE)
   set_property(TEST logGitStatus PROPERTY SKIP_RETURN_CODE 2)
   set_tests_properties(checkGitStatus PROPERTIES FIXTURES_CLEANUP SOURCETREE)