Merge pull request #41 from airtower-luna/meson-build

Switch the build system to Meson

Author: airtower-luna

.dir-locals.el

@@ -0,0 +1,19 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{c,h,h.in}]
+indent_style = space
+indent_size = 4
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.yaml]
+indent_style = space
+indent_size = 2

.editorconfig

@@ -8,7 +8,7 @@ inputs:
     required: no
     default: 'gcc'
   configure-options:
-    description: 'Additional options to pass to ./configure'
+    description: 'Additional options to pass to meson setup'
     required: no
     default: ''
   artifact-prefix:
@@ -19,37 +19,35 @@ runs:
   using: composite
   steps:
     - name: network overview
-      shell: bash
+      shell: sh
       run: |
         ip addr show
         cat /etc/hosts
     - name: find usable IPs for tests
-      shell: bash
+      shell: sh
       run: |
         echo "test_ips=$(python3 test/check_test_ips.py -H localhost)" >> ${GITHUB_ENV}
-    - name: autoreconf
-      shell: bash
-      run: autoreconf -fiv
-    - name: configure
-      shell: bash
-      run: CC="${{ inputs.cc }}" TEST_IP="${test_ips}" APACHE_MUTEX=pthread ./configure ${{ inputs.configure-options }}
-    - name: store config.log
-      uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: ${{ inputs.artifact-prefix }}-config-log
-        path: config.log
-    - name: make
-      shell: bash
-      run: make -j4
-    - name: make check
-      shell: bash
-      run: VERBOSE=1 make -j4 check
+    - name: 'workaround for Meson versions < 1.1'
+      shell: sh
+      run: ln -s meson.options meson_options.txt
+    - name: meson setup
+      shell: sh
+      run: meson setup -Dtest-ips="${TEST_IPS}" ${{ inputs.configure-options }} build
+      env:
+        CC: "${{ inputs.cc }}"
+        TEST_IPS: "${{ env.test_ips }}"
+    - name: meson compile
+      shell: sh
+      run: meson compile -C build/
+    - name: meson test
+      shell: sh
+      run: meson test -C build/ --verbose
     - name: store test logs
       uses: actions/upload-artifact@v4
       if: failure() || cancelled()
       with:
         name: ${{ inputs.artifact-prefix }}-test-logs
         path: |
-          test/test-*.log
-          test/logs/
+          build/meson-logs/
+          build/test/*.log
+          build/test/logs/

.github/build-action/action.yaml

@@ -20,67 +20,70 @@ permissions:
 jobs:
 
   clang:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: debian:bookworm
     name: clang-analyzer
     steps:
       - name: install dependencies
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps clang clang-tools
+          apt-get -y install meson make git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps clang clang-tools
       - uses: actions/checkout@v4
-      - name: find usable IPs for tests
-        run: |
-          echo "test_ips=$(python3 test/check_test_ips.py -H localhost)" >> ${GITHUB_ENV}
-      - name: autoreconf
-        run: autoreconf -fiv
-      - name: configure
-        run: scan-build --use-cc=clang ./configure TEST_IP="${test_ips}" APACHE_MUTEX=pthread CFLAGS=-Wno-error=null-pointer-subtraction
-      - name: store config.log
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: scan-build-config-log
-          path: config.log
-      - name: make
-        run: scan-build -sarif -o sarif-output --use-cc=clang make
-      - name: find output directory
-        run: |
-          echo "SARIF_DIR=$(ls -d sarif-output/*)" >> ${GITHUB_ENV}
+      - name: 'workaround for Meson versions < 1.1'
+        run: ln -s meson.options meson_options.txt
       - name: define CONTAINER_WORKSPACE
         run: |
           echo "CONTAINER_WORKSPACE=${PWD}" >> ${GITHUB_ENV}
-      - name: upload SARIF results
-        uses: github/codeql-action/upload-sarif@v3
+      - name: meson setup
+        run: |
+          meson setup -Dpdf-doc=false build
+      - name: ninja scan-build
+        env:
+          SCANBUILD: '${{ env.CONTAINER_WORKSPACE }}/support/scan-build-wrapper.sh'
+        run: |
+          ninja -C build/ scan-build
+      - name: find output file
+        id: html-output
+        run: |
+          scan_index="$(find build/meson-logs/scanbuild/ -name index.html)"
+          if [ -n "$scan_index" ]; then
+              echo ::warning::clang-analyzer detected errors
+              echo "dir=$(dirname "$scan_index")" >> ${GITHUB_OUTPUT}
+          else
+              echo "dir=" >> ${GITHUB_OUTPUT}
+          fi
+      - name: upload HTML report
+        uses: actions/upload-artifact@v4
+        # If clang-analyzer didn't detect any issues, there's no
+        # report to upload.
+        if: steps.html-output.outputs.dir
         with:
-          sarif_file: ${{ env.SARIF_DIR }}
-          checkout_path: ${{ env.CONTAINER_WORKSPACE }}
+          name: clang-analyzer-report
+          path: ${{ steps.html-output.outputs.dir }}
 
   cppcheck:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: debian:bookworm
     name: cppcheck
     steps:
       - name: install dependencies
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps bear cppcheck
+          apt-get -y install meson make git python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps cppcheck
       - uses: actions/checkout@v4
-      - name: autoreconf
-        run: autoreconf -fiv
-      - name: configure
-        run: ./configure APACHE_MUTEX=pthread
-      - name: make and create compile_commands.json
-        run: bear -- make -j4
+      - name: 'workaround for Meson versions < 1.1'
+        run: ln -s meson.options meson_options.txt
+      - name: meson setup
+        run: meson setup -Dpdf-doc=false build
       - name: cppcheck
         run: |
-          cppcheck --project=compile_commands.json -DAF_UNIX=1 --enable=warning,style,unusedFunction --xml 2>cppcheck.xml
+          ninja -C build/ cppcheck-xml
       - uses: airtower-luna/[email protected]
         with:
           tool: 'CppCheck'
-          input_file: 'cppcheck.xml'
+          input_file: 'build/cppcheck.xml'
           sarif_file: 'cppcheck.sarif'
       - name: define CONTAINER_WORKSPACE
         run: |
@@ -92,23 +95,21 @@ jobs:
           checkout_path: ${{ env.CONTAINER_WORKSPACE }}
 
   codeql:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: CodeQL
     steps:
       - uses: actions/checkout@v4
       - name: install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -y install python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps
+          sudo apt-get -y install meson make python3-yaml apache2-bin apache2-dev gnutls-bin libapr1-dev libgnutls28-dev pkgconf procps
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: cpp
-      - name: autoreconf
-        run: autoreconf -fiv
-      - name: configure
-        run: ./configure --disable-pdf-doc
-      - name: make
-        run: make -j4
+      - name: meson setup
+        run: meson setup -Dpdf-doc=false build
+      - name: meson compile
+        run: meson compile -C build/
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/analysis.yaml

@@ -20,7 +20,7 @@ jobs:
         container:
           - 'debian:bookworm'
           - 'debian:sid'
-          - 'fedora:39'
+          - 'fedora:40'
           - 'alpine:latest'
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
@@ -32,15 +32,15 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pandoc pkgconf procps iproute2 softhsm2
+          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev make meson openssl pandoc pkgconf procps iproute2 softhsm2
       - name: install dependencies (Fedora)
         if: startsWith(matrix.container, 'fedora')
         run: |
-          dnf -y install bzip2 curl gcc gnutls-devel gnutls-utils httpd-devel iproute libtool make pkgconf python3-pyyaml redhat-rpm-config softhsm
+          dnf -y install bzip2 curl gcc gnutls-devel gnutls-utils httpd-devel iproute make meson pkgconf python3-pyyaml redhat-rpm-config softhsm
       - name: install dependencies (Alpine)
         if: startsWith(matrix.container, 'alpine')
         run: |
-          apk add apache2 apache2-dev apache2-proxy autoconf automake bash build-base gnutls-dev gnutls-utils libtool pkgconf python3 py3-yaml
+          apk add apache2 apache2-dev apache2-proxy build-base gnutls-dev gnutls-utils make meson musl-dev pkgconf python3 py3-yaml
       - name: set prefix for container-specific artifacts
         # this is because upload-artifact doesn't like ":" in file names
         env:
@@ -51,35 +51,28 @@ jobs:
         uses: ./.github/build-action/
         with:
           artifact-prefix: ${{ env.artifact_prefix }}
-      - name: make distcheck
-        run: VERBOSE=1 make -j4 distcheck
 
   coverage:
     runs-on: ubuntu-latest
-    container: debian:bookworm
+    container: debian:trixie
     name: coverage
     steps:
       - uses: actions/checkout@v4
       - name: install dependencies
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkgconf procps iproute2 softhsm2 clang llvm
+          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl make meson pkgconf procps iproute2 softhsm2 clang llvm gcovr
       - name: build mod_gnutls with coverage support
         uses: ./.github/build-action/
         with:
           cc: clang
-          configure-options: >-
-            --enable-clang-coverage
-            CFLAGS="-Wno-null-pointer-subtraction"
+          configure-options: -Db_coverage=true
           artifact-prefix: coverage
       - name: generate coverage report
-        working-directory: ./test
-        run: make -j4 coverage
+        run: ninja -C build/ coverage-html
       - name: store coverage report
         uses: actions/upload-artifact@v4
         with:
           name: coverage-report
-          path: test/coverage/
-      - name: coverage summary
-        run: llvm-cov report src/.libs/mod_gnutls.so -instr-profile=test/outputs/coverage.profdata src/*.c src/*.h include/*.h
+          path: build/meson-logs/coveragereport/

.github/workflows/build.yaml

@@ -26,9 +26,9 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt-get update
-          apt-get -y install python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkgconf procps iproute2 softhsm2 valgrind
+          apt-get -y install meson make python3-yaml apache2-bin apache2-dev curl gnutls-bin libapr1-dev libgnutls28-dev openssl pkgconf procps iproute2 softhsm2 valgrind
       - name: build mod_gnutls and run tests with Valgrind
         uses: ./.github/build-action/
         with:
-          configure-options: --enable-valgrind-test
+          configure-options: -Dvalgrind-test=true -Dpdf-doc=false
           artifact-prefix: valgrind

.github/workflows/valgrind.yaml

@@ -1,25 +1,4 @@
 *~
-*.o
-*.lo
-*.la
-Makefile
-Makefile.in
-config
-autom4te.cache
-configure
-config.*
-libtool
-src/.deps
-src/.libs
-include/mod_gnutls.h
-include/mod_gnutls_config.h
-include/stamp-h1
-aclocal.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
 # clangd cache and compile config
 /.cache
 /compile_commands.json