[pango/wip/meson-only: 2/2] Simplify the documentation build
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/wip/meson-only: 2/2] Simplify the documentation build
- Date: Fri, 19 May 2017 14:39:44 +0000 (UTC)
commit ee797889a03825aa09c3fdc11313b9ebd09e46f6
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri May 19 15:38:20 2017 +0100
Simplify the documentation build
Now that we don't have to care about Autotools, we can simplify the
documentation build, by removing bits and pieces from ages past.
docs/meson.build | 15 ++-------------
docs/{pango-docs.sgml => pango-docs.xml} | 9 +++++----
docs/{pango_markup.sgml => pango-markup.xml} | 0
docs/version.xml.in | 1 -
4 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index 2349689..b773cda 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,11 +1,5 @@
subdir('xml')
-version_xml_conf = configuration_data()
-version_xml_conf.set('PANGO_VERSION', meson.project_version())
-configure_file(input: 'version.xml.in',
- output: 'version.xml',
- configuration: version_xml_conf)
-
private_headers = [
'ftglue.h',
'modules.h',
@@ -51,8 +45,7 @@ if not host_system.contains('windows')
endif
content_files = [
- 'pango_markup.sgml',
- 'version.xml',
+ 'pango-markup.xml',
]
html_images = [
@@ -81,7 +74,7 @@ cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html')
docpath = join_paths(pango_datadir, 'gtk-doc', 'html')
gnome.gtkdoc('pango',
- main_xml: 'pango-docs.sgml',
+ main_xml: 'pango-docs.xml',
src_dir: [
join_paths(meson.source_root(), 'pango'),
join_paths(meson.build_root(), 'pango'),
@@ -94,10 +87,6 @@ gnome.gtkdoc('pango',
'--ignore-decorators=_PANGO_EXTERN',
'--ignore-headers=' + ' '.join(private_headers),
],
- mkdb_args: [
- '--sgml-mode',
- '--output-format=xml',
- ],
fixxref_args: [
'--html-dir=@0@'.format(docpath),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.xml
similarity index 95%
rename from docs/pango-docs.sgml
rename to docs/pango-docs.xml
index 3c74d4a..245af12 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.xml
@@ -2,13 +2,14 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
-<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
-<!ENTITY version SYSTEM "version.xml">
+ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
+ <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+ %gtkdocentities;
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>Pango Reference Manual</title>
- <releaseinfo>for Pango &version;</releaseinfo>
+ <releaseinfo>for Pango &package_version;</releaseinfo>
</bookinfo>
<chapter id="pango">
@@ -18,7 +19,7 @@
<xi:include href="xml/fonts.xml"/>
<xi:include href="xml/text-attributes.xml"/>
<xi:include href="xml/tab-stops.xml"/>
- <xi:include href="pango_markup.sgml"/>
+ <xi:include href="pango-markup.xml"/>
<xi:include href="xml/layout.xml"/>
<xi:include href="xml/scripts.xml"/>
<xi:include href="xml/bidi.xml"/>
diff --git a/docs/pango_markup.sgml b/docs/pango-markup.xml
similarity index 100%
rename from docs/pango_markup.sgml
rename to docs/pango-markup.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]