[gtk+/wip/meson] fixup! build: Generate the API references (WIP)
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson] fixup! build: Generate the API references (WIP)
- Date: Wed, 19 Apr 2017 11:20:03 +0000 (UTC)
commit fd42b337fed8d6cc0edb7a55811560e1dd38fcfb
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Apr 19 12:18:36 2017 +0100
fixup! build: Generate the API references (WIP)
docs/reference/gtk/Makefile.am | 2 +-
.../reference/gtk/{gtk-docs.sgml => gtk4-docs.xml} | 0
.../gtk/{gtk3-overrides.txt => gtk4-overrides.txt} | 0
docs/reference/gtk/meson.build | 33 ++++++++++++++++++++
docs/reference/meson.build | 4 ++
5 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index e02fc81..9ec9fb1 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = 1.6
DOC_MODULE=gtk4
# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gtk-docs.sgml
+DOC_MAIN_SGML_FILE=gtk4-docs.xml
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk4-docs.xml
similarity index 100%
rename from docs/reference/gtk/gtk-docs.sgml
rename to docs/reference/gtk/gtk4-docs.xml
diff --git a/docs/reference/gtk/gtk3-overrides.txt b/docs/reference/gtk/gtk4-overrides.txt
similarity index 100%
rename from docs/reference/gtk/gtk3-overrides.txt
rename to docs/reference/gtk/gtk4-overrides.txt
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
new file mode 100644
index 0000000..4f51593
--- /dev/null
+++ b/docs/reference/gtk/meson.build
@@ -0,0 +1,33 @@
+private_headers = [
+]
+
+images = [
+]
+
+configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+gnome.gtkdoc('gtk4',
+ main_xml: 'gtk4-docs.xml',
+ src_dir: [
+ join_paths(meson.source_root(), 'gtk'),
+ join_paths(meson.build_root(), 'gtk'),
+ ],
+ dependencies: libgtk_dep,
+ gobject_typesfile: 'gtk4.types',
+ scan_args: [
+ '--ignore-decorators=_GDK_EXTERN',
+ '--ignore-decorators=G_GNUC_WARN_UNUSED_RESULT',
+ '--ignore-headers=' + ' '.join(private_headers),
+ ],
+ fixxref_args: [
+ '--html-dir=@0@'.format(docpath),
+ '--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')),
+ '--extra-dir=@0@'.format(cairo_docpath),
+ '--extra-dir=@0@'.format(gdkpixbuf_docpath),
+ '--extra-dir=../gdk',
+ '--extra-dir=../gsk',
+ ],
+ html_assets: images,
+ install: true)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index e09f2a7..53458a6 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -4,6 +4,9 @@ glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
+gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
+gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
+
docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
version_conf = configuration_data()
@@ -11,3 +14,4 @@ version_conf.set('GTK_VERSION', meson.project_version())
subdir('gdk')
subdir('gsk')
+subdir('gtk')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]