diff --git a/doc/libvips-docs.xml.in b/doc/libvips-docs.xml similarity index 97% rename from doc/libvips-docs.xml.in rename to doc/libvips-docs.xml index a4f36e8a..ff45096e 100644 --- a/doc/libvips-docs.xml.in +++ b/doc/libvips-docs.xml @@ -4,12 +4,13 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ + ]> libvips Reference Manual - For libvips @VIPS_VERSION@. The latest version of this documentation + For libvips &version;. The latest version of this documentation can be found on the libvips website. diff --git a/doc/meson.build b/doc/meson.build index ef0ee24e..d9767ccf 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -126,8 +126,12 @@ images = files( ) version_conf = configuration_data() -version_conf.set('VIPS_VERSION', meson.project_version ()) -vips_docs = configure_file(input: 'libvips-docs.xml.in', output: 'libvips-docs.xml', configuration: version_conf) +version_conf.set('VIPS_VERSION', meson.project_version()) +version_xml = configure_file( + input: 'version.xml.in', + output: '@BASENAME@', + configuration: version_conf +) glib_prefix = glib_dep.get_variable(pkgconfig: 'prefix') glib_docpath = glib_prefix / 'share' / 'gtk-doc' / 'html' @@ -135,16 +139,14 @@ docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc' / 'html' gnome.gtkdoc('libvips', mode: 'none', - main_xml: 'libvips-docs.xml.in', + main_xml: 'libvips-docs.xml', src_dir: [ join_paths(project_source_root, 'libvips'), join_paths(project_build_root, 'libvips'), ], dependencies: libvips_dep, - scan_args: [ - '--ignore-headers=' + ' '.join(private_headers), - '--rebuild-types', - ], + ignore_headers: private_headers, + scan_args: '--rebuild-types', mkdb_args: [ '--default-includes=vips/vips.h' ], fixxref_args: [ '--html-dir=@0@'.format(docpath), @@ -152,7 +154,7 @@ gnome.gtkdoc('libvips', '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')), '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')), ], - content_files: [ content_files, markdown_content_files_docbook ], + content_files: [ content_files, markdown_content_files_docbook, version_xml ], expand_content_files: [ content_files ], html_assets: images, install: true diff --git a/doc/version.xml.in b/doc/version.xml.in new file mode 100644 index 00000000..5c53e293 --- /dev/null +++ b/doc/version.xml.in @@ -0,0 +1 @@ +@VIPS_VERSION@ \ No newline at end of file