From 488939b6a18ae4e9a2f487141c71d08611698a80 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Fri, 2 May 2025 23:05:35 +0200
Subject: [PATCH] gitlab-ci: Enable documentation in more tests

---
 .gitlab-ci.yml            | 4 ++--
 .gitlab-ci/dist.sh        | 2 +-
 .gitlab-ci/setup_mingw.sh | 2 +-
 .gitlab-ci/test_cmake.sh  | 1 +
 .gitlab-ci/test_meson.sh  | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 293b987a7..9cfbd4e87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,8 +95,8 @@ clang:msan:
     - win32-ps
   variables:
     BASE_CONFIG: "--with-http --with-lzma --with-zlib --with-python"
-    # Disabled for now, see #658
-    CONFIG: "--without-python"
+    # Python is disabled for now, see #658
+    CONFIG: "--with-docs --without-python"
     CHERE_INVOKING: "yes"
   before_script:
     - $Env:Path="C:\msys64\usr\bin;$Env:Path"
diff --git a/.gitlab-ci/dist.sh b/.gitlab-ci/dist.sh
index 59c324252..3749adf02 100644
--- a/.gitlab-ci/dist.sh
+++ b/.gitlab-ci/dist.sh
@@ -5,7 +5,7 @@ set -e
 mkdir -p libxml2-dist
 cd libxml2-dist
 sh ../autogen.sh
-make distcheck V=1 DISTCHECK_CONFIGURE_FLAGS='--with-legacy'
+make distcheck V=1 DISTCHECK_CONFIGURE_FLAGS='--with-docs --with-legacy'
 if [ -z "$CI_COMMIT_TAG" ]; then
     mv libxml2-*.tar.xz libxml2-git-$CI_COMMIT_SHORT_SHA.tar.xz
 fi
diff --git a/.gitlab-ci/setup_mingw.sh b/.gitlab-ci/setup_mingw.sh
index bdc3df028..7eb3e3552 100644
--- a/.gitlab-ci/setup_mingw.sh
+++ b/.gitlab-ci/setup_mingw.sh
@@ -6,7 +6,7 @@ prefix=
 if [ -n "$MINGW_PACKAGE_PREFIX" ]; then
     prefix="${MINGW_PACKAGE_PREFIX}-"
 fi
-for module in doxygen libiconv python xz zlib "$@"; do
+for module in docbook-xsl doxygen libiconv python xsltproc xz zlib "$@"; do
     pacman --noconfirm -S --needed ${prefix}$module
 done
 
diff --git a/.gitlab-ci/test_cmake.sh b/.gitlab-ci/test_cmake.sh
index b1b6c03b0..434b2de5a 100644
--- a/.gitlab-ci/test_cmake.sh
+++ b/.gitlab-ci/test_cmake.sh
@@ -7,6 +7,7 @@ cmake "$@" \
     -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
     -DCMAKE_INSTALL_PREFIX=libxml2-install \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DLIBXML2_WITH_DOCS=ON \
     -DLIBXML2_WITH_HTTP=ON \
     -DLIBXML2_WITH_LZMA=ON \
     -DLIBXML2_WITH_ZLIB=ON \
diff --git a/.gitlab-ci/test_meson.sh b/.gitlab-ci/test_meson.sh
index 75918ab1e..a7406f9e3 100644
--- a/.gitlab-ci/test_meson.sh
+++ b/.gitlab-ci/test_meson.sh
@@ -11,6 +11,7 @@ meson  setup \
        --werror \
        --buildtype=debugoptimized \
        --default-library shared \
+       -Ddocs=enabled \
        -Dhttp=enabled \
        -Dlzma=enabled \
        -Dzlib=enabled \