From d3f85ae6eafd35fe066138149f7263ee3f89c4d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Feb 2020 03:42:42 +0100 Subject: [PATCH] extension-tool: Use asciidoctor for manpage The Python implementation of Asciidoc is abandoned and stuck with Python 2. Asciidoctor is a maintained implementation written in Ruby. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/992 --- subprojects/extensions-tool/man/meson.build | 4 +-- .../extensions-tool/man/stylesheet.xsl | 27 ------------------- subprojects/extensions-tool/meson.build | 2 +- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 subprojects/extensions-tool/man/stylesheet.xsl diff --git a/subprojects/extensions-tool/man/meson.build b/subprojects/extensions-tool/man/meson.build index cca6fc49f..5de246d6b 100644 --- a/subprojects/extensions-tool/man/meson.build +++ b/subprojects/extensions-tool/man/meson.build @@ -1,7 +1,7 @@ custom_target('gnome-extensions.1', - input: ['gnome-extensions.adoc', 'stylesheet.xsl'], + input: 'gnome-extensions.adoc', output: 'gnome-extensions.1', - command: [a2x, '-D', '@OUTDIR@', '--xsl-file', '@INPUT1@', '-f', 'manpage', '@INPUT0@'], + command: [asciidoctor, '-D', '@OUTDIR@', '-b', 'manpage', '@INPUT@'], install_dir: mandir + '/man1', install: true ) diff --git a/subprojects/extensions-tool/man/stylesheet.xsl b/subprojects/extensions-tool/man/stylesheet.xsl deleted file mode 100644 index 047bd1b59..000000000 --- a/subprojects/extensions-tool/man/stylesheet.xsl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - .PP - - - - - - - - - - .RS 4 - - .\" - - - - .RE - - - - diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build index ca7e67ce2..7f7d8e4e9 100644 --- a/subprojects/extensions-tool/meson.build +++ b/subprojects/extensions-tool/meson.build @@ -36,7 +36,7 @@ if bash_completion.found() endif if get_option('man') - a2x = find_program('a2x') + asciidoctor = find_program('asciidoctor') subdir('man') endif