Merge branch 'release/1.33.0'

Author: Ozaq

.github/workflows/docs.yml

@@ -0,0 +1,80 @@
+name: Publish Documentation to sites.ecmwf.int
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+  push:
+    branches:
+      - 'develop'
+      - 'master'
+    tags:
+      - '**'
+jobs:
+  build:
+    if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' || github.event_name == 'push'}}
+    runs-on: ubuntu-latest
+    outputs:
+      artifact-id: ${{ steps.upload-doc.outputs.artifact-id }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - name: Install python dependencies
+        run: |
+          python -m pip install -r docs/requirements.txt
+      - name: Prepare Doxygen
+        uses: ecmwf/reusable-workflows/setup-doxygen@main
+        with:
+          version: 1.14.0
+      - name: Build doc
+        run: |
+          cd docs
+          make -j html
+      - name: Archive documentation
+        id: upload-doc
+        uses: actions/upload-artifact@v4
+        with:
+          name: documentation
+          path: docs/_build/html
+  preview-publish:
+    if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }}
+    needs: build
+    uses: ecmwf/reusable-workflows/.github/workflows/pr-preview-publish.yml@main
+    with:
+      artifact-id: ${{ needs.build.outputs.artifact-id }}
+      space: docs
+      name: dev-section
+      path: eckit/pull-requests
+      link-text: 🌦️ >> Documentation << 🌦️
+    secrets:
+      sites-token: ${{ secrets.ECMWF_SITES_DOCS_DEV_SECTION_TOKEN }}
+  preview-unpublish:
+    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' }}
+    uses: ecmwf/reusable-workflows/.github/workflows/pr-preview-unpublish.yml@main
+    with:
+      space: docs
+      name: dev-section
+      path: eckit/pull-requests
+    secrets:
+      sites-token: ${{ secrets.ECMWF_SITES_DOCS_DEV_SECTION_TOKEN }}
+  publish:
+    if: >-
+      ${{ github.event_name == 'push' && (
+        github.ref_name == 'develop' ||
+        github.ref_name == 'master'  ||
+        github.ref_type == 'tag'
+      ) }}
+    needs: build
+    uses: ecmwf/reusable-workflows/.github/workflows/docs-publish.yml@main
+    with:
+      artifact-id: ${{ needs.build.outputs.artifact-id }}
+      space: docs
+      name: dev-section
+      path: eckit
+      id: ${{ github.ref_name }}
+      softlink: ${{ github.ref_name == 'master'   && 'stable'
+                 || github.ref_name == 'develop' && 'latest' }}
+    secrets:
+      sites-token: ${{ secrets.ECMWF_SITES_DOCS_DEV_SECTION_TOKEN }}

.gitignore

@@ -11,4 +11,5 @@ doc/latex
 .idea
 build/
 tests/geo/eckit_geo_cache
+_build
 *.ccls-cache

CMakeLists.txt

@@ -9,7 +9,7 @@
 ########################################################################################################################
 
 
-cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.18 FATAL_ERROR )
 
 find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
 
@@ -146,7 +146,7 @@ ecbuild_add_option( FEATURE LZ4
 
 ecbuild_add_option( FEATURE AEC
                     DESCRIPTION "AEC support for compression"
-                    REQUIRED_PACKAGES AEC )
+                    REQUIRED_PACKAGES "NAME libaec VERSION 1.0.6")
 
 ecbuild_add_option( FEATURE ZIP
                     DESCRIPTION "ZIP support for compression"
@@ -165,6 +165,12 @@ ecbuild_add_option( FEATURE ECKIT_CODEC
 
 set( eckit_CODEC_STATIC_ASSERT ON CACHE BOOL "eckit::codec static assertions" )
 
+### eckit::spec
+
+ecbuild_add_option( FEATURE ECKIT_SPEC
+                    DEFAULT ON
+                    DESCRIPTION "eckit::spec metadata library" )
+
 ### eckit::maths
 
 ecbuild_add_option( FEATURE CONVEX_HULL
@@ -189,21 +195,6 @@ ecbuild_add_option( FEATURE ECKIT_GEO
                     DEFAULT ON
                     DESCRIPTION "eckit::geo geometry library" )
 
-ecbuild_add_option( FEATURE GEO_GRID_FESOM
-                    DEFAULT ON
-                    CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
-                    DESCRIPTION "eckit::geo geometry library support for FESOM grids" )
-
-ecbuild_add_option( FEATURE GEO_GRID_ICON
-                    DEFAULT ON
-                    CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
-                    DESCRIPTION "eckit::geo geometry library support for ICON grids" )
-
-ecbuild_add_option( FEATURE GEO_GRID_ORCA
-                    DEFAULT ON
-                    CONDITION eckit_HAVE_ECKIT_GEO AND eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4
-                    DESCRIPTION "eckit::geo geometry library support for ORCA grids" )
-
 ecbuild_add_option( FEATURE GEO_CACHING
                     DEFAULT OFF
                     CONDITION eckit_HAVE_ECKIT_GEO
@@ -225,13 +216,20 @@ ecbuild_add_option( FEATURE GEO_AREA_SHAPEFILE
                     REQUIRED_PACKAGES shapelib
                     DESCRIPTION "eckit::geo geometry library support for shapefiles" )
 
+set( ECKIT_GEO_CODEC_GRIDS OFF )
+if( eckit_HAVE_ECKIT_CODEC AND eckit_HAVE_LZ4 )
+    set( ECKIT_GEO_CODEC_GRIDS ON )
+endif()
+
 if( eckit_HAVE_GEO_AREA_SHAPEFILE )
     if( NOT TARGET shapelib::shp OR NOT TARGET libzip::zip )
         message( FATAL_ERROR "eckit::geo geometry library support for shapefiles requires the shapelib::shp and libzip::zip libraries" )
     endif()
 endif()
 
-set( eckit_GEO_CACHE_PATH "~/.local/share/eckit/geo" )
+# (keep paths as strings to avoid normalisation/expansion)
+set( eckit_GEO_CACHE_PATH "~/.local/share/eckit/geo" CACHE STRING "eckit::geo cache path default" )
+set( eckit_GEO_SHARE_URL_PREFIX "https://sites.ecmwf.int/repository/eckit/geo" CACHE STRING "eckit::geo URL prefix for downloadable assets" )
 
 ### LAPACK
 
@@ -339,6 +337,12 @@ ecbuild_add_option( FEATURE PROJ
                     DESCRIPTION "support PROJ-based projections"
                     REQUIRED_PACKAGES "PROJ 9.1.1" )
 
+ecbuild_add_option(
+    FEATURE DOCS
+    DEFAULT OFF
+    DESCRIPTION "Enable documentation generation"
+)
+
 ### c math library, needed when including "math.h"
 
 find_package( CMath )
@@ -370,8 +374,9 @@ include(cmake/compiler_warnings.cmake) # optionally handle compiler specific war
 set( PERSISTENT_NAMESPACE "eckit" CACHE INTERNAL "" ) # needed for generating .b files for persistent support
 
 add_subdirectory( src )
-add_subdirectory( bamboo )
-add_subdirectory( doc )
+if(eckit_HAVE_DOCS)
+    add_subdirectory(docs)
+endif()
 add_subdirectory( share )
 
 if( eckit_HAVE_TESTS )

VERSION

@@ -1 +1 @@
-1.32.4
+1.33.0