docs: update readthedocs setup

Update the configuration so it works for two projects.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

.readthedocs.yaml

@@ -1,23 +1,25 @@
 # SPDX-License-Identifier: Apache-2.0
-
 version: 2
 
 build:
   os: ubuntu-24.04
   tools:
-    python: "3"
+    python: "3.11"
+
   apt_packages:
     - meson
     - python3-lxml
     - docbook-xsl
     - xsltproc
     - pandoc
-  jobs:
-    post_install:
-      - pip3 install lxml
-    pre_build:
-      - meson setup .build -Ddocs=rst -Ddocs-build=true -Dnvme=disabled -Dlibnvme=disabled -Dpython=disabled || cat .build/meson-logs/meson-log.txt
-      - meson compile -C .build
+    - asciidoc
+    - xmlto
+
+  commands:
+    - pip install lxml
+    - scripts/build.sh docs
+    - cp .build-ci/Documentation/nvme.html .build-ci/Documentation/index.html
+
+  output: .build-ci/Documentation
 
-sphinx:
-  configuration: .build/libnvme/doc/conf.py
+formats: []

libnvme/.readthedocs.yaml

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+
+version: 2
+
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.11"
+
+  apt_packages:
+    - meson
+    - python3-lxml
+    - docbook-xsl
+    - xsltproc
+    - pandoc
+
+  commands:
+    - pip install lxml
+    - scripts/build.sh rst_docs
+
+sphinx:
+  configuration: .build-ci/libnvme/doc/conf.py

scripts/build.sh

@@ -23,7 +23,8 @@ usage() {
     echo "  cross               use cross toolchain to build"
     echo "  coverage            build coverage report"
     echo "  distro              build libnvme and nvme-cli separately"
-    echo "  docs                build documentation"
+    echo "  docs                build all documentation"
+    echo "  rst_docs            build rst documentation only"
     echo "  static              build a static binary"
     echo "  libnvme             build only libnvme"
     echo ""
@@ -123,12 +124,24 @@ config_meson_coverage() {
 
 config_meson_docs() {
     CC="${CC}" "${MESON}" setup                 \
+        -Dnvme=disabled                         \
+        -Dlibnvme=disabled                      \
         -Ddocs=all                              \
         -Ddocs-build=true                       \
         --prefix=/tmp/usr                       \
         "${BUILDDIR}"
 }
 
+config_meson_rst_docs() {
+    CC="${CC}" "${MESON}" setup                 \
+        -Dnvme=disabled                         \
+        -Dlibnvme=disabled                      \
+        -Ddocs=rst                              \
+        -Ddocs-build=true                       \
+        --prefix=/tmp/usr                       \
+        "${BUILDDIR}"
+}
+
 config_meson_static() {
     CC="${CC}" "${MESON}" setup                 \
         --werror                                \
@@ -146,8 +159,8 @@ config_meson_libnvme() {
     CC="${CC}" "${MESON}" setup                 \
         --werror                                \
         --buildtype="${BUILDTYPE}"              \
-	-Dnvme=disabled				\
-	-Dlibnvme=enabled			\
+        -Dnvme=disabled                         \
+        -Dlibnvme=enabled                       \
         "${BUILDDIR}"
 }