[libgda] Enable more experimental for documentation generation
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Enable more experimental for documentation generation
- Date: Thu, 11 Apr 2019 20:07:56 +0000 (UTC)
commit f90470142a846622b8d51174bc47ea5cb0d610a6
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Apr 11 15:04:48 2019 -0500
Enable more experimental for documentation generation
.gitlab-ci.yml | 2 +-
libgda-report/meson.build | 13 +++++++-----
libgda-ui/data-entries/plugins/meson.build | 2 ++
libgda-ui/meson.build | 3 ++-
providers/ldap/meson.build | 11 ++++++----
tools/meson.build | 28 +++++++++++++-------------
tools/misc/meson.build | 32 ++++++++++--------------------
7 files changed, 45 insertions(+), 46 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f741e3997..14cb577c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ library_build:
documentation_build:
stage: doc_generation
script:
- - meson _build --prefix=/usr -Denable-gtk-doc=true
+ - meson _build --prefix=/usr -Denable-gtk-doc=true -Denable-experimental=true -Denable-tools=true
-Denable-ldap=true
- cd _build
- ninja
- ninja install
diff --git a/libgda-report/meson.build b/libgda-report/meson.build
index ea478a9d7..b7985e971 100644
--- a/libgda-report/meson.build
+++ b/libgda-report/meson.build
@@ -21,6 +21,12 @@ libgda_report_sources += libgda_report_engine_sources
libgda_report_sources += libgda_report_docbook_sources
libgda_report_sources += libgda_report_rml_sources
+libgda_report_cargs = [
+ '-include',
+ meson.build_root() + '/config.h',
+ ]
+libgda_report_cargs += c_args
+
libgda_report = library(
'gda-report-'+project_api_version,
libgda_report_sources,
@@ -33,10 +39,7 @@ libgda_report = library(
inc_libgdah_dep,
inc_sqliteh_dep
],
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- ],
+ c_args: libgda_report_cargs,
link_with: libgda,
install : true
)
@@ -56,4 +59,4 @@ test_rt_parser = executable('test-rt-parser',
link_with: [libgda, libgda_report],
install: false
)
-test('RtParser', test_rt_parser)
\ No newline at end of file
+test('RtParser', test_rt_parser)
diff --git a/libgda-ui/data-entries/plugins/meson.build b/libgda-ui/data-entries/plugins/meson.build
index 2f22b97ed..429207c63 100644
--- a/libgda-ui/data-entries/plugins/meson.build
+++ b/libgda-ui/data-entries/plugins/meson.build
@@ -12,6 +12,8 @@ data_entries_plugins_cargs = [
'-DLIBDIR="'+plugindir+'"'
]
+data_entries_plugins_cargs += c_args
+
gcrypt_headers= []
gcrypt_sources= []
if libcryp_config.found()
diff --git a/libgda-ui/meson.build b/libgda-ui/meson.build
index 309dd71c1..a574d4ca6 100644
--- a/libgda-ui/meson.build
+++ b/libgda-ui/meson.build
@@ -18,6 +18,7 @@ libgda_ui_cargs = [
'-DGDA_ABI_VERSION="'+project_api_version+'"'
]
libgda_ui_cargs += iso_codes_cargs
+libgda_ui_cargs += c_args
libgda_ui_headers = files([
'gdaui-basic-form.h',
'gdaui-combo.h',
@@ -213,4 +214,4 @@ libgdaui_vapi = custom_target('gdaui'+project_api_version+'_vapi',
)
endif
-subdir('demos')
\ No newline at end of file
+subdir('demos')
diff --git a/providers/ldap/meson.build b/providers/ldap/meson.build
index 079ce1ee2..6deb9a8c0 100644
--- a/providers/ldap/meson.build
+++ b/providers/ldap/meson.build
@@ -84,6 +84,12 @@ libgda_ldap_providerpc = configure_file(
install_dir: join_paths(get_option('libdir'),'pkgconfig')
)
+libgda_ldap_provider_cargs = [
+ '-include',
+ join_paths(gda_top_build, 'config.h'),
+ ]
+libgda_ldap_provider_cargs += c_args
+
libgda_ldap_provider = library ('gda-ldap-'+project_api_version,
libgda_ldap_sources,
dependencies: [
@@ -94,10 +100,7 @@ libgda_ldap_provider = library ('gda-ldap-'+project_api_version,
inc_libgdah_dep,
inc_libgda_ldaph_dep
],
- c_args: [
- '-include',
- join_paths(gda_top_build, 'config.h'),
- ],
+ c_args: libgda_ldap_provider_cargs,
link_args: [
'-export-dynamic',
],
diff --git a/tools/meson.build b/tools/meson.build
index ae6a38d48..0ac7c31d8 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -22,8 +22,10 @@ gda_sql_deps = [
gda_sql_cargs = [
'-include',
- meson.build_root() + '/config.h',
+ join_paths(gda_top_build, 'config.h'),
]
+gda_sql_cargs += c_args
+
if soup_dep.found()
gda_sql_cargs += [
'-DLIBSOUP=1'
@@ -34,8 +36,8 @@ endif
tools_cargs = [
'-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"',
+ join_paths(gda_top_build, 'config.h'),
+ '-DROOT_DIR="'+gda_top_src+'"',
'-DIS_BROWSER',
'-DHAVE_GTK_CLASSES'
]
@@ -45,6 +47,8 @@ tools_cargs += [
]
endif
+tools_cargs += c_args
+
gda_sql = executable('gda-sql-'+project_api_version,
gda_sql_sources,
link_with: libgda,
@@ -88,7 +92,7 @@ endif
browser_resourcesc = custom_target('browser_resourcesc',
command: [compile_resources,
'--sourcedir='+meson.current_build_dir(),
- '--sourcedir='+join_paths(meson.source_root(),'tools','resources'),
+ '--sourcedir='+join_paths(gda_top_src,'tools','resources'),
'--generate-source',
'--target', '@OUTPUT@',
'--internal',
@@ -103,7 +107,7 @@ browser_resourcesc = custom_target('browser_resourcesc',
browser_resourcesh = custom_target('browser_resourcesh',
command: [compile_resources,
'--sourcedir='+meson.current_build_dir(),
- '--sourcedir='+join_paths(meson.source_root(),'tools','resources'),
+ '--sourcedir='+join_paths(gda_top_src,'tools','resources'),
'--generate-header',
'--target', '@OUTPUT@',
'--internal',
@@ -135,7 +139,7 @@ if windows
gda_browser_link_args += ['-mwindows']
win_res = win.compile_resources('gda-browser-res.rc',
depend_files: 'gda-browser.ico',
- include_directories: join_paths(meson.source_root(),'tools')
+ include_directories: join_paths(gda_top_src,'tools')
)
gda_browser_sources += win_res
endif
@@ -172,19 +176,15 @@ tsplitter_sources += basetool_sources
tsplitter = executable('test-splitter',
tsplitter_sources,
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"'
- ],
+ c_args: gda_sql_cargs,
link_with: libgda,
dependencies: tsplitter_deps,
install: false
)
test('Splitter', tsplitter,
env: [
- 'GDA_TOP_SRC_DIR='+meson.source_root(),
- 'GDA_TOP_BUILD_DIR='+meson.build_root()
+ 'GDA_TOP_SRC_DIR='+gda_top_src,
+ 'GDA_TOP_BUILD_DIR='+gda_top_src
]
)
-endif
\ No newline at end of file
+endif
diff --git a/tools/misc/meson.build b/tools/misc/meson.build
index 9da4aed51..8f0001695 100644
--- a/tools/misc/meson.build
+++ b/tools/misc/meson.build
@@ -1,3 +1,9 @@
+gda_tools_cargs = [
+ '-include',
+ join_paths(gda_top_build, 'config.h'),
+ '-DROOT_DIR="'+gda_top_src+'"'
+ ]
+gda_tools_cargs += c_args
executable('gda-list-config-'+project_api_version,
'gda-list-config.c',
@@ -8,11 +14,7 @@ executable('gda-list-config-'+project_api_version,
inc_libgdah_dep,
inc_sqliteh_dep
],
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"'
- ],
+ c_args: gda_tools_cargs,
install: true
)
@@ -31,11 +33,7 @@ executable('gda-list-server-op-'+project_api_version,
inc_libgdah_dep,
inc_sqliteh_dep
],
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"'
- ],
+ c_args: gda_tools_cargs,
install: true
)
@@ -49,11 +47,7 @@ executable('information-schema-doc',
inc_libgdah_dep,
inc_sqliteh_dep
],
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"'
- ],
+ c_args: gda_tools_cargs,
)
@@ -66,9 +60,5 @@ executable('information-schema-types',
inc_libgdah_dep,
inc_sqliteh_dep
],
- c_args: [
- '-include',
- meson.build_root() + '/config.h',
- '-DROOT_DIR="'+meson.source_root()+'"'
- ],
- )
\ No newline at end of file
+ c_args: gda_tools_cargs,
+ )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]