Merge commit 'cdd2575f7fbab1d8162600f4048bc37503c80e28'

Author: Sibras

.editorconfig

@@ -2,14 +2,10 @@
 
 root = true
 
-[Makefile*]
-indent_style = tab
-
-[CMakeLists.txt]
-indent_style = tab
-indent_size = 4
-
-[*.{c,h}]
+[*]
 indent_style = space
 indent_size = 4
 tab_width = 8
+
+[Makefile*]
+indent_style = tab

.gitignore

@@ -5,7 +5,6 @@
 *.pyc
 
 # Executables
-/example/gjobread
 /xmlcatalog
 /xmllint
 
@@ -48,15 +47,18 @@ Makefile.in
 /autom4te.cache
 /compile
 /config.guess
+/config.guess~
 /config.h.in
 /config.h.in~
 /config.log
 /config.status
 /config.sub
+/config.sub~
 /configure
 /configure~
 /depcomp
 /install-sh
+/install-sh~
 /libtool
 /ltmain.sh
 /missing

.gitlab-ci.yml

@@ -274,12 +274,22 @@ cmake:msvc:v141:x86:static:
     BUILD_SHARED_LIBS: "OFF"
     SUFFIX: static
 
+meson:
+  image: registry.gitlab.gnome.org/gnome/libxml2
+  script:
+    - sh .gitlab-ci/test_meson.sh
+
+cmake:linux:gcc:shared:
+  extends: .cmake:linux
+  variables:
+    BUILD_SHARED_LIBS: "ON"
+    CC: gcc
+    SUFFIX: linux-gcc-shared
+
 pages:
   script:
     - mkdir -p public
-    - cp -r doc/devhelp doc/tutorial doc/xmllint.html doc/xmlcatalog.html public
-    - mkdir -p public/examples
-    - cp doc/examples/*.html doc/examples/*.c public/examples
+    - cp -r doc/devhelp doc/xmllint.html doc/xmlcatalog.html public
   artifacts:
     paths:
       - public

.gitlab-ci/Dockerfile

@@ -1,16 +1,16 @@
 # The image is also used for libxslt, that's why we need git and
 # libgcrypt-dev.
 
-FROM ubuntu:22.10
+FROM ubuntu:23.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
         curl git ca-certificates \
         autoconf automake libtool pkg-config \
-        make gcc clang llvm \
+        make gcc clang llvm libclang-rt-dev \
         zlib1g-dev liblzma-dev libgcrypt-dev \
-        python2-dev python3-dev \
-        cmake
+        python3-dev \
+        cmake meson
 WORKDIR /tests
 RUN curl https://www.w3.org/XML/Test/xmlts20080827.tar.gz |tar xz

.gitlab-ci/test.sh

@@ -3,6 +3,6 @@
 set -e
 
 cd libxml2-build
-sh ../autogen.sh $BASE_CONFIG $CONFIG
+sh ../autogen.sh $BASE_CONFIG $CONFIG || cat config.log
 make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror"
 make CFLAGS="$CFLAGS -Werror" check

.gitlab-ci/test_meson.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+# compile with the following warnings:
+# --warnlevel 3     : passes to the compiler -Wall -Wextra -Wpedantic
+# --werror          : passes to the compiler -Werror
+# --default-library : can be 'shared', 'static' or 'both'
+meson  setup \
+       --warnlevel 3 \
+       --werror \
+       --buildtype=debugoptimized \
+       --default-library shared \
+       builddir
+
+ninja -C builddir test
+