|
 |
05cd86c |
From 3bf44e21bba1b83c0f8698779263a5e7679d6f19 Mon Sep 17 00:00:00 2001
|
|
|
05cd86c |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
05cd86c |
Date: Mon, 19 Jun 2017 19:53:58 -0400
|
|
|
05cd86c |
Subject: [PATCH 4/6] Add example of generated header in docs.
|
|
|
05cd86c |
|
|
|
05cd86c |
---
|
|
|
05cd86c |
.../frameworks/10 gtk-doc/doc/foobar-docs.sgml | 1 +
|
|
|
05cd86c |
.../frameworks/10 gtk-doc/include/foo-version.h.in | 29 ++++++++++++++++++++++
|
|
|
05cd86c |
.../frameworks/10 gtk-doc/include/meson.build | 10 ++++++++
|
|
|
05cd86c |
test cases/frameworks/10 gtk-doc/meson.build | 4 ++-
|
|
|
05cd86c |
4 files changed, 43 insertions(+), 1 deletion(-)
|
|
|
05cd86c |
create mode 100644 test cases/frameworks/10 gtk-doc/include/foo-version.h.in
|
|
|
05cd86c |
create mode 100644 test cases/frameworks/10 gtk-doc/include/meson.build
|
|
|
05cd86c |
|
|
|
05cd86c |
diff --git a/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml b/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml
|
|
|
05cd86c |
index d23b22fe..028b8083 100644
|
|
|
05cd86c |
--- a/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml
|
|
|
05cd86c |
+++ b/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml
|
|
|
05cd86c |
@@ -34,6 +34,7 @@
|
|
|
05cd86c |
</para>
|
|
|
05cd86c |
</partintro>
|
|
|
05cd86c |
<xi:include href="xml/foo.xml"/>
|
|
|
05cd86c |
+ <xi:include href="xml/foo-version.xml"/>
|
|
|
05cd86c |
</reference>
|
|
|
05cd86c |
|
|
|
05cd86c |
</book>
|
|
|
05cd86c |
diff --git a/test cases/frameworks/10 gtk-doc/include/foo-version.h.in b/test cases/frameworks/10 gtk-doc/include/foo-version.h.in
|
|
|
05cd86c |
new file mode 100644
|
|
|
05cd86c |
index 00000000..30751cd7
|
|
|
05cd86c |
--- /dev/null
|
|
|
05cd86c |
+++ b/test cases/frameworks/10 gtk-doc/include/foo-version.h.in
|
|
|
05cd86c |
@@ -0,0 +1,29 @@
|
|
|
05cd86c |
+#pragma once
|
|
|
05cd86c |
+
|
|
|
05cd86c |
+/**
|
|
|
05cd86c |
+ * SECTION:version
|
|
|
05cd86c |
+ * @section_id: foo-version
|
|
|
05cd86c |
+ * @short_description: <filename>foo-version.h</filename>
|
|
|
05cd86c |
+ * @title: Foo Versioning
|
|
|
05cd86c |
+ */
|
|
|
05cd86c |
+
|
|
|
05cd86c |
+/**
|
|
|
05cd86c |
+ * FOO_MAJOR_VERSION:
|
|
|
05cd86c |
+ *
|
|
|
05cd86c |
+ * The major version of foo.
|
|
|
05cd86c |
+ */
|
|
|
05cd86c |
+#define FOO_MAJOR_VERSION (@FOO_MAJOR_VERSION@)
|
|
|
05cd86c |
+
|
|
|
05cd86c |
+/**
|
|
|
05cd86c |
+ * FOO_MINOR_VERSION:
|
|
|
05cd86c |
+ *
|
|
|
05cd86c |
+ * The minor version of foo.
|
|
|
05cd86c |
+ */
|
|
|
05cd86c |
+#define FOO_MINOR_VERSION (@FOO_MINOR_VERSION@)
|
|
|
05cd86c |
+
|
|
|
05cd86c |
+/**
|
|
|
05cd86c |
+ * FOO_MICRO_VERSION:
|
|
|
05cd86c |
+ *
|
|
|
05cd86c |
+ * The micro version of foo.
|
|
|
05cd86c |
+ */
|
|
|
05cd86c |
+#define FOO_MICRO_VERSION (@FOO_MICRO_VERSION@)
|
|
|
05cd86c |
diff --git a/test cases/frameworks/10 gtk-doc/include/meson.build b/test cases/frameworks/10 gtk-doc/include/meson.build
|
|
|
05cd86c |
new file mode 100644
|
|
|
05cd86c |
index 00000000..4c85b801
|
|
|
05cd86c |
--- /dev/null
|
|
|
05cd86c |
+++ b/test cases/frameworks/10 gtk-doc/include/meson.build
|
|
|
05cd86c |
@@ -0,0 +1,10 @@
|
|
|
05cd86c |
+cdata = configuration_data()
|
|
|
05cd86c |
+parts = meson.project_version().split('.')
|
|
|
05cd86c |
+cdata.set('FOO_MAJOR_VERSION', parts[0])
|
|
|
05cd86c |
+cdata.set('FOO_MINOR_VERSION', parts[1])
|
|
|
05cd86c |
+cdata.set('FOO_MICRO_VERSION', parts[2])
|
|
|
05cd86c |
+configure_file(input : 'foo-version.h.in',
|
|
|
05cd86c |
+ output : 'foo-version.h',
|
|
|
05cd86c |
+ configuration : cdata,
|
|
|
05cd86c |
+ install : true,
|
|
|
05cd86c |
+ install_dir : get_option('includedir'))
|
|
|
05cd86c |
diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build
|
|
|
05cd86c |
index 95eeefa7..4cfcca18 100644
|
|
|
05cd86c |
--- a/test cases/frameworks/10 gtk-doc/meson.build
|
|
|
05cd86c |
+++ b/test cases/frameworks/10 gtk-doc/meson.build
|
|
|
05cd86c |
@@ -1,4 +1,4 @@
|
|
|
05cd86c |
-project('gtkdoctest', 'c')
|
|
|
05cd86c |
+project('gtkdoctest', 'c', version : '1.0.0')
|
|
|
05cd86c |
|
|
|
05cd86c |
gnome = import('gnome')
|
|
|
05cd86c |
|
|
|
05cd86c |
@@ -6,6 +6,8 @@ assert(gnome.gtkdoc_html_dir('foobar') == 'share/gtkdoc/html/foobar', 'Gtkdoc in
|
|
|
05cd86c |
|
|
|
05cd86c |
inc = include_directories('include')
|
|
|
05cd86c |
|
|
|
05cd86c |
+subdir('include')
|
|
|
05cd86c |
+
|
|
|
05cd86c |
# We have to disable this test until this bug fix has landed to
|
|
|
05cd86c |
# distros https://bugzilla.gnome.org/show_bug.cgi?id=753145
|
|
|
05cd86c |
error('MESON_SKIP_TEST can not enable gtk-doc test until upstream fixes have landed.')
|
|
|
05cd86c |
--
|
|
|
05cd86c |
2.13.0
|
|
|
05cd86c |
|