[libgda] CI: documentation index uses API version
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] CI: documentation index uses API version
- Date: Thu, 26 Jul 2018 17:33:33 +0000 (UTC)
commit fb28e15ebb889148f62a2147afc6926c3beba92c
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Jul 26 12:24:59 2018 -0500
CI: documentation index uses API version
.gitlab-ci.yml | 4 ++--
doc/{index.html => index.html.in} | 2 +-
doc/meson.build | 10 +++++++++-
3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ce34ef81..5b08e5232 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,11 +83,11 @@ pages:
- ninja
- ninja install
- mkdir ../public
- - mv ../doc/index.html ../public/
+ - mv doc/index.html ../public/
- mkdir ../public/C
- mv doc/C/* ../public/C/
- mkdir ../public/vala
- - mv doc/libgda-6.0 ../public/vala
+ - mv doc/vala/libgda-6.0 ../public/vala
artifacts:
paths:
- public
\ No newline at end of file
diff --git a/doc/index.html b/doc/index.html.in
similarity index 60%
rename from doc/index.html
rename to doc/index.html.in
index a31390a49..7d1445a16 100644
--- a/doc/index.html
+++ b/doc/index.html.in
@@ -5,6 +5,6 @@
<h2>C API</h2>
<p>GDA is written in C, checkout API <a href="C">documentation</a></p>
<h2>Vala API</h2>
- <p>GDA has GObject Introspection support and <a href="vala">Vala Bindings</a></p>
+ <p>GDA has GObject Introspection support and <a href="vala/libgda-@GDA_API_VERSION@/index.htm">Vala
Bindings</a></p>
</body>
</html>
\ No newline at end of file
diff --git a/doc/meson.build b/doc/meson.build
index 4f3f78c50..e5715d590 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,5 +1,13 @@
subdir('C')
+pageconf = configuration_data()
+pageconf.set('GDA_API_VERSION', project_api_version)
+configure_file(
+ input: 'index.html.in',
+ output: 'index.html',
+ configuration: pageconf
+ )
+
if valadoc.found()
vala_doc = custom_target('vala_doc',
command: [ valadoc,
@@ -16,7 +24,7 @@ if valadoc.found()
'@INPUT@'
],
input: libgda_vapi,
- output: '.',
+ output: 'vala',
build_by_default: true,
install: true,
install_dir: join_paths (get_option ('datadir'), 'devhelp','books'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]