[libgda: 1/6] DOC: Doc was activated for meson build

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit b0c054a3ba13fa56736a3bf3289d940feb39c00e
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Mon Jan 28 22:27:27 2019 -0600

    DOC: Doc was activated for meson build
    
    For some reason xml/gda-data-select.xml generate an error and
    documentation can't be built. Therefore, this file was excluded for now.

 .gitlab-ci.yml                         | 36 +++++++-------------
 doc/C/.gitignore                       |  1 -
 doc/C/libgda/libgda-6.0-docs.xml       |  4 +--
 doc/C/libgda/meson.build               | 60 ++++++++++++++++++++++------------
 doc/C/libgda/xml/gtkdocentities.ent.in |  9 +++++
 doc/C/libgda/xml/meson.build           | 11 +++++++
 meson.build                            |  2 +-
 7 files changed, 73 insertions(+), 50 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dc2a0ae9..3352156d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,24 +133,6 @@ meson_build:
   - broadwayd &
   - GDK_BACKEND=broadway meson test
   - ninja install
-  - cd ..
-  artifacts:
-    when: on_failure
-    paths:
-    - _build/meson-logs/testlog.txt
-    - _build/meson-logs/meson-log.txt
-    - _build/doc/C/libgda/html
-    - _build/doc/C/libgdaui/html
-    - _build/doc/Gda-6.0
-    - _build/doc/Gdaui-6.0
-    expire_in: 1 week
-pages:
-  stage: build
-  script:
-  - meson -Denable-gtk-doc=true _build
-  - cd _build
-  - ninja
-  - ninja install
   - mkdir ../public
   - mv doc/index.html ../public/
   - mkdir ../public/C
@@ -160,12 +142,16 @@ pages:
   - mv doc/Gdaui-6.0 ../public/vala
   - cp libgda/libgda-6.0.vapi ../public/vala
   - cp libgda-ui/libgdaui-6.0.vapi ../public/vala
-  # Fix meson gtk-doc generation to remove next
-  - cd ..
-  - ./autogen.sh --enable-gtk-doc
-  - make
-  - mv doc/C/libgda/html public/C/libgda-6.0
-  - mv doc/C/libgdaui/html public/C/libgdaui-6.0
   artifacts:
     paths:
-    - public
\ No newline at end of file
+    - public
+  artifacts:
+    when: on_failure
+    paths:
+    - _build/meson-logs/testlog.txt
+    - _build/meson-logs/meson-log.txt
+    - _build/doc/C/libgda/html
+    - _build/doc/C/libgdaui/html
+    - _build/doc/Gda-6.0
+    - _build/doc/Gdaui-6.0
+    expire_in: 1 week
\ No newline at end of file
diff --git a/doc/C/.gitignore b/doc/C/.gitignore
index 612ccec48..ba5014f29 100644
--- a/doc/C/.gitignore
+++ b/doc/C/.gitignore
@@ -1,5 +1,4 @@
 html
-xml
 html-build.stamp
 html.stamp
 libgda-6.0-decl-list.txt
diff --git a/doc/C/libgda/libgda-6.0-docs.xml b/doc/C/libgda/libgda-6.0-docs.xml
index aa0184641..097b53fb3 100644
--- a/doc/C/libgda/libgda-6.0-docs.xml
+++ b/doc/C/libgda/libgda-6.0-docs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+               "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";
 [
   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
   <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
@@ -67,7 +67,7 @@
       <xi:include href="xml/gda-data-proxy.xml"/>
       <xi:include href="xml/gda-meta-store.xml"/>
       <xi:include href="xml/gda-meta-struct.xml"/>
-      <xi:include href="xml/gda-data-select.xml"/>
+<!--      <xi:include href="xml/gda-data-select.xml"/> -->
     </chapter>
 
     <chapter id="Data Handlers">
diff --git a/doc/C/libgda/meson.build b/doc/C/libgda/meson.build
index 4b7023f77..95a3604dd 100644
--- a/doc/C/libgda/meson.build
+++ b/doc/C/libgda/meson.build
@@ -1,3 +1,5 @@
+subdir('xml')
+
 libgda_typesdoc = configure_file(
                input: 'libgda.types.in',
                output : 'libgda.types',
@@ -60,31 +62,47 @@ contentf = [
        doc_builddate
        ]
 contentf += files([
-       'fdl-appendix.sgml'
+       'fdl-appendix.sgml',
+        'author-list.xml', 
+        'installation.xml'
        ])
 
 # ignore_bdb = []
 # if bdb_found
 # else
-#      ignore_bdb += ['gda-data-model-bdb.h']
+#      ignore_bdb += ['gda-data-model-bdb.h']
 # endif
 
-# gnome_module.gtkdoc(project_package,
-#      main_xml: project_package+'-docs.xml',
-#      scan_args: [
-#              '--deprecated-guards="GDA_DISABLE_DEPRECATED"',
-#              '--rebuild-types',
-#              '--ignore-headers',
-#              'gda-marshal.h', 'gda-custom-marshal.h', 'gda-enum-types.h', 'sqlite3.h',
-#              'csv.h', 'md5.h', 'jni-wrapper.h', 'gda-jdbc-recordset.h',
-#              'gda-jdbc-blob-op.h', 'gda-jdbc-provider.h', 'gda-jdbc-pstmt.h',
-#              'providers', 'tools control-center', 'tests', 'examples', 'plugins', 'tmp',
-#              ignore_bdb
-#               ],
-#      src_dir: join_paths(meson.source_root(),'libgda'),
-#      mkdb_args: [
-#              '--xml-mode',
-#              '--output-format=xml',
-#              '--name-space=gda'
-#              ],
-#      )
+libgda_doc_dep = declare_dependency(link_with: [libgda])
+glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
+glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+
+
+gnome_module.gtkdoc(
+        project_package,
+        main_xml: project_package+'-docs.xml',
+        namespace: 'gda',
+        mode: 'none',
+        src_dir: join_paths(meson.source_root(),'libgda'),
+        dependencies: [libgda_doc_dep, libgda_dep],
+        scan_args: [
+                '--deprecated-guards="GDA_DISABLE_DEPRECATED"',
+                '--rebuild-types'
+        ],
+        content_files: contentf,
+        html_assets: gda_html_images,
+        fixxref_args: [
+                '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+        ],
+        ignore_headers: [
+                'gda-data-model-bdb.h',
+                'dummy-object.h',
+                'sqlite3.h'
+        ],
+        mkdb_args: [
+                '--xml-mode'
+        ],
+        install: true
+    )
diff --git a/doc/C/libgda/xml/gtkdocentities.ent.in b/doc/C/libgda/xml/gtkdocentities.ent.in
new file mode 100644
index 000000000..c311f64a9
--- /dev/null
+++ b/doc/C/libgda/xml/gtkdocentities.ent.in
@@ -0,0 +1,9 @@
+<!ENTITY LIBGDA "@PACKAGE@">
+<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
+<!ENTITY package_name "@PACKAGE_NAME@">
+<!ENTITY package_string "@PACKAGE_STRING@">
+<!ENTITY package_tarname "@PACKAGE_TARNAME@">
+<!ENTITY package_url "@PACKAGE_URL@">
+<!ENTITY package_version "@PACKAGE_VERSION@">
+<!ENTITY package_api_version "@PACKAGE_API_VERSION@">
+
diff --git a/doc/C/libgda/xml/meson.build b/doc/C/libgda/xml/meson.build
new file mode 100644
index 000000000..e60d5462c
--- /dev/null
+++ b/doc/C/libgda/xml/meson.build
@@ -0,0 +1,11 @@
+ent_conf = configuration_data()
+ent_conf.set('PACKAGE', 'libgda')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/libgda/issues')
+ent_conf.set('PACKAGE_NAME', 'libgda')
+ent_conf.set('PACKAGE_STRING', 'libgda')
+ent_conf.set('PACKAGE_TARNAME', 'libgda-' + meson.project_version())
+ent_conf.set('PACKAGE_URL', 'http://gitlab.gnome.org/GNOME/libgda')
+ent_conf.set('PACKAGE_VERSION', meson.project_version())
+ent_conf.set('PACKAGE_API_VERSION', project_api_version)
+configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf)
+
diff --git a/meson.build b/meson.build
index 77c4c7644..7ef25ddbb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('libgda', 'vala', 'c',
         license: 'LGPL2+',
         version : '5.91.0',
-        meson_version: '>= 0.44.1',
+        meson_version: '>= 0.48',
         default_options: [
                         'c_std=gnu11',
                         'warning_level=2',