[libgda] Meson: gtkdoc generation

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 89c21de1f3773aa85baed6753f77c105eb1c0111
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Jul 22 14:21:13 2018 -0500

    Meson: gtkdoc generation

 doc/C/meson.build                    | 98 +++++++++++++++++++++++++++++++++++-
 libgda-ui/internal/meson.build       |  9 +++-
 libgda/meson.build                   |  5 +-
 libgda/sqlite/sqlite-src/meson.build | 10 +++-
 meson.build                          | 18 ++++++-
 providers/jdbc/meson.build           |  8 +++
 providers/meson.build                |  4 ++
 tools/meson.build                    | 13 -----
 8 files changed, 146 insertions(+), 19 deletions(-)
---
diff --git a/doc/C/meson.build b/doc/C/meson.build
index 66160fcba..bbfd1f6aa 100644
--- a/doc/C/meson.build
+++ b/doc/C/meson.build
@@ -1,4 +1,100 @@
 libgda_typesdoc = configure_file(
                input: 'libgda.types.in',
                output : 'libgda.types',
-               configuration : conf)
\ No newline at end of file
+               configuration : conf)
+
+html_images = files([
+       'DataModels.png',
+       'architecture.png',
+       'parts.png',
+       'stmt-unknown.png',
+       'stmt-select.png',
+       'stmt-insert1.png',
+       'stmt-insert2.png',
+       'stmt-update.png',
+       'stmt-compound.png',
+       'information_schema.png',
+       'MetaStore1.png',
+       'MetaStore2.png',
+       'i_s_data_types.png',
+       'writable_data_model.png',
+       'GdaDataModelIter.png',
+       'data_validation_holder.png',
+       'data_validation_proxy.png',
+       'data_validation_set.png',
+       'data_proxy1.png',
+       'data_proxy2.png',
+       'data_proxy3.png',
+       'data_proxy4.png',
+       'data_proxy5.png',
+       'gda-sql-graph.png',
+       'howto-exec.png',
+       'GdaStatement.png',
+       'parser_gen.png',
+       'parser_prov.png',
+       'tree-overview.png',
+       'tree-overview2.png',
+       'SqlIdentifiers.png',
+       'thread-wrapper.png',
+       'vi-basic-form.png',
+       'vi-combo.png',
+       'vi-data-entry.png',
+       'vi-login.png',
+       'vi-cloud.png',
+       'vi-provider-selector.png',
+       'vi-raw-grid.png',
+       'vi-info.png',
+       'vi-filter.png',
+       'vi-server-op.png',
+       'vi-rte.png',
+       'connection-status.png'
+       ])
+
+doc_conf = configuration_data()
+doc_conf.set('GDA_VERSION', project_version)
+doc_conf.set('GDA_BUILDDATE', dates.stdout())
+
+doc_version = configure_file(
+       input: 'version.xml.in',
+       output: 'version.xml',
+       configuration: doc_conf
+       )
+
+doc_builddate= configure_file(
+       input: 'builddate.xml.in',
+       output: 'builddate.xml',
+       configuration: doc_conf
+       )
+
+contentf = [
+       doc_version,
+       doc_builddate
+       ]
+contentf += files([
+       'fdl-appendix.sgml'
+       ])
+
+gnome_module.gtkdoc(project_package,
+       main_sgml: project_package+'-docs.sgml',
+       content_files: contentf,
+       html_assets: html_images,
+       scan_args: '--deprecated-guards="GDA_DISABLE_DEPRECATED"',
+       html_args: '--path="'+meson.current_build_dir()+'"',
+       src_dir: join_paths(meson.source_root(),'doc','src-files'),
+       mkdb_args: [
+               '--sgml-mode',
+               '--output-format=xml',
+               '--name-space=gda',
+               '--ignore-files', 'parser.c',
+               'delimiter.c', 'binreloc.c', 'libcsv.c',
+               'md5c.c', 'providers', 'tools', 'control-center',
+               'tests', 'tmp', 'examples','plugins'
+       ],
+       scan_args: [
+               '--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'
+                ]
+       )
\ No newline at end of file
diff --git a/libgda-ui/internal/meson.build b/libgda-ui/internal/meson.build
index 9c2f678a0..fd3c08f7f 100644
--- a/libgda-ui/internal/meson.build
+++ b/libgda-ui/internal/meson.build
@@ -5,8 +5,13 @@ libgda_ui_internal_sources = files([
        'gdaui-provider-auth-editor.h',
        'gdaui-provider-spec-editor.c',
        'gdaui-provider-spec-editor.h',
-       'popup-container.h',
        'popup-container.c',
        'utility.h',
        'utility.c'
-       ])
\ No newline at end of file
+       ])
+
+libgda_ui_popup_containerh = files([
+       'popup-container.h',
+       ])
+
+libgda_ui_internal_sources += libgda_ui_popup_containerh
diff --git a/libgda/meson.build b/libgda/meson.build
index 8d0f233b2..d1f874635 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -178,8 +178,10 @@ libgda_sources= files([
        'gda-data-pivot.c'
        ])
 
+libgda_source_csvh = files([
+       'csv.h'
+       ])
 libgda_source_all = files([
-       'csv.h',
        'libcsv.c',
        'dir-blob-op.h',
        'dir-blob-op.c',
@@ -206,6 +208,7 @@ libgda_source_all += [
        libgda_headers_all,
        gda_enums,
        gda_marshalls,
+       libgda_source_csvh
        ]
 libgda_source_all += [
        sqlitesources,
diff --git a/libgda/sqlite/sqlite-src/meson.build b/libgda/sqlite/sqlite-src/meson.build
index e7e313fee..d09f96705 100644
--- a/libgda/sqlite/sqlite-src/meson.build
+++ b/libgda/sqlite/sqlite-src/meson.build
@@ -1,8 +1,16 @@
-sqlite_src = files([
+sqlite_srcc = files([
        'sqlite3.c',
+       ])
+
+sqlite_srch = files([
        'sqlite3.h'
        ])
 
+sqlite_src = [
+       sqlite_srcc,
+       sqlite_srch
+       ]
+
 sqlite_src_c_args = [
        '-DSQLITE_ENABLE_COLUMN_METADATA',
        '-DSQLITE_THREADSAFE=1',
diff --git a/meson.build b/meson.build
index 30fdcbf62..f6dfe4f40 100644
--- a/meson.build
+++ b/meson.build
@@ -212,9 +212,26 @@ intlmerge = find_program('intltool-merge')
 # Vala bindings
 vapigen = find_program('vapigen', required: false)
 
+found_jdbc = false
+
+
+dates = compiler.run('''
+#include<glib.h>
+#include <glib/gprintf.h>
+
+void main (void) {
+  GDateTime *dt;
+  dt = g_date_time_new_now_local ();
+  g_print (g_date_time_format(dt, "%F"));
+}
+''',
+dependencies: glib_dep
+)
+
 subdir('po')
 subdir('libgda')
 subdir('providers')
+subdir('doc')
 
 gtk_dep = dependency('gtk+-3.0', required: false)
 enable_ui = get_option('with-ui') and gtk_dep.found()
@@ -298,7 +315,6 @@ libgda_report_pc = configure_file(
        )
 endif
 
-subdir('doc')
 subdir('tools')
 subdir('tests')
 subdir('testing')
diff --git a/providers/jdbc/meson.build b/providers/jdbc/meson.build
new file mode 100644
index 000000000..d525fe0f4
--- /dev/null
+++ b/providers/jdbc/meson.build
@@ -0,0 +1,8 @@
+
+jdbc_doc_ignore = files([
+       'jni-wrapper.h',
+       'gda-jdbc-recordset.h',
+       'gda-jdbc-blob-op.h',
+       'gda-jdbc-provider.h',
+       'gda-jdbc-pstmt.h'
+       ])
\ No newline at end of file
diff --git a/providers/meson.build b/providers/meson.build
index 3e29ad470..48b627fde 100644
--- a/providers/meson.build
+++ b/providers/meson.build
@@ -10,4 +10,8 @@ endif
 
 if ldap_found
 subdir('ldap')
+endif
+
+if found_jdbc
+subdir('jdbc')
 endif
\ No newline at end of file
diff --git a/tools/meson.build b/tools/meson.build
index 4d458f57b..f25a82db8 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -6,19 +6,6 @@ subdir('common')
 subdir('base')
 subdir('help')
 
-dates = compiler.run('''
-#include<glib.h>
-#include <glib/gprintf.h>
-
-void main (void) {
-  GDateTime *dt;
-  dt = g_date_time_new_now_local ();
-  g_print (g_date_time_format(dt, "%F"));
-}
-''',
-dependencies: glib_dep
-)
-
 gda_sql_sources = files([
        'tools-main.c'
        ])