[libsoup/fix-gtk-doc] meson: Fix generation of gtk-doc documents and enable it in CI




commit 500098eb42e309ca0d304d10663ec63dc264b23d
Author: Diego Pino Garcia <dpino igalia com>
Date:   Mon May 10 14:48:55 2021 +0800

    meson: Fix generation of gtk-doc documents and enable it in CI
    
    It seem Gtk-doc doesn't interpret escaped parenthesis in 'ignore-decorators' as
    parenthesis characters, but as grouping operators. What is happening is
    that the regular expression for matching strings like 'SOUP_DEPRECATED_IN_3_0_FOR(f)'
    is doing an extra matching, causing an error in parsing.
    
    Gtk-doc has code in place for expanding an ignore-decorator expression using
    parenthesis to '\(\w*\)'.

 .gitlab-ci.yml             | 2 +-
 docs/reference/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e43a4230..a5d6cf13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,7 @@ reference:
   needs: []
   script:
     - meson _build -Dgtk_doc=true
-    # FIXME: ninja -C _build libsoup-3.0-doc fails
+    - ninja -C _build libsoup-3.0-doc
     - ninja -C _build install
     - mv _build/docs/reference/html/ _reference/
     - .gitlab-ci/check-docs.py
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 3aea8764..d4da1310 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -50,7 +50,7 @@ mkdb_args = [
 scan_args = [
   '--deprecated-guards=SOUP_DISABLE_DEPRECATED',
   '--rebuild-types',
-  '--ignore-decorators="SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*"'
+  '--ignore-decorators="SOUP_DEPRECATED\w*\s*()|SOUP_DEPRECATED\w*|SOUP_AVAILABLE[\w_]*"'
 ]
 
 glib_prefix = glib_dep.get_pkgconfig_variable('prefix')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]