From 141572ff38e20fd0484554e5b869c72aded88c9e Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Wed, 21 Jul 2021 15:50:00 +0200 Subject: [PATCH] [doc] Fixes related to meson. meson-0.57.0 or higher required --- doc/meson.build | 101 +++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 1da7c5db..51f383f0 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -26,48 +26,52 @@ features_txt = custom_target('features.txt', input: ['../features.conf'], output: 'features.txt', capture: true, - command: ['@CURRENT_SOURCE_DIR@/tools/conf2doc', '@INPUT@']) + command: [meson.current_source_dir() + '/tools/conf2doc', '@INPUT@']) keymap_actions_txt = custom_target('keymap-actions.txt', input: ['../src/config/kbdbind.c'], output: 'keymap-actions.txt', capture: true, - command: ['@CURRENT_SOURCE_DIR@/tools/keys2doc', '@INPUT@', 'keymap-actions.txt']) + command: [meson.current_source_dir() + '/tools/keys2doc', '@INPUT@', 'keymap-actions.txt']) keymap_defaults_txt = custom_target('keymap-defaults.txt', input: ['../src/config/kbdbind.c'], output: 'keymap-defaults.txt', capture: true, - command: ['@CURRENT_SOURCE_DIR@/tools/keys2doc', '@INPUT@', 'keymap-defaults.txt']) + command: [meson.current_source_dir() + '/tools/keys2doc', '@INPUT@', 'keymap-defaults.txt']) option_command_frag_xml = custom_target('option-command.frag.xml', input: [], output: 'option-command.frag.xml', - command: ['LC_ALL=C', 'LANGUAGE=en', '@CURRENT_SOURCE_DIR@/tools/help2xml', elinks, '@OUTPUT@']) + env: ['LC_ALL=C', 'LANGUAGE=en'], + command: [meson.current_source_dir() + '/tools/help2xml', elinks, '@OUTPUT@']) option_config_frag_xml = custom_target('option-config.frag.xml', input: [], output: 'option-config.frag.xml', - command: ['LC_ALL=C', 'LANGUAGE=en', '@CURRENT_SOURCE_DIR@/tools/help2xml', elinks, '@OUTPUT@']) + env: ['LC_ALL=C', 'LANGUAGE=en'], + command: [meson.current_source_dir() + '/tools/help2xml', elinks, '@OUTPUT@']) option_command_frag_xhtml = custom_target('option-command.frag.xhtml', input: [], output: 'option-command.frag.xhtml', - command: ['LC_ALL=C', 'LANGUAGE=en', '@CURRENT_SOURCE_DIR@/tools/help2xml', elinks, '@OUTPUT@']) + env: ['LC_ALL=C', 'LANGUAGE=en'], + command: [meson.current_source_dir() + '/tools/help2xml', elinks, '@OUTPUT@']) option_config_frag_xhtml = custom_target('option-config.frag.xhtml', input: [], output: 'option-config.frag.xhtml', - command: ['LC_ALL=C', 'LANGUAGE=en', '@CURRENT_SOURCE_DIR@/tools/help2xml', elinks, '@OUTPUT@']) + env: ['LC_ALL=C', 'LANGUAGE=en'], + command: [meson.current_source_dir() + '/tools/help2xml', elinks, '@OUTPUT@']) elinks_1_html = custom_target('elinks.1.html', input: 'elinks.1.txt', output: 'elinks.1.html', depends: option_command_frag_xhtml, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/xhtml11.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/xhtml11.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'xhtml11', @@ -77,10 +81,10 @@ elinks_conf_5_html = custom_target('elinks.conf.5.html', input: 'elinks.conf.5.txt', output: 'elinks.conf.5.html', depends: option_config_frag_xhtml, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/xhtml11.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/xhtml11.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'xhtml11', @@ -90,10 +94,10 @@ elinkskeys_5_html = custom_target('elinkskeys.5.html', input: 'elinkskeys.5.txt', output: 'elinkskeys.5.html', depends: [keymap_actions_txt, keymap_defaults_txt], - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/xhtml11.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/xhtml11.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'xhtml11', @@ -102,10 +106,10 @@ elinkskeys_5_html = custom_target('elinkskeys.5.html', hacking_html = custom_target('hacking.html', input: 'hacking.txt', output: 'hacking.html', - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/xhtml11.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/xhtml11.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'xhtml11', @@ -115,10 +119,10 @@ manual_html = custom_target('manual.html', input: 'manual.txt', output: 'manual.html', depends: features_txt, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/xhtml11.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/xhtml11.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'xhtml11', @@ -128,10 +132,10 @@ elinks_1_xml = custom_target('elinks.1.xml', input: 'elinks.1.txt', output: 'elinks.1.xml', depends: option_command_frag_xml, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/docbook.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/docbook.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'docbook', @@ -142,10 +146,10 @@ elinks_conf_5_xml = custom_target('elinks.conf.5.xml', input: 'elinks.conf.5.txt', output: 'elinks.conf.5.xml', depends: option_config_frag_xml, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/docbook.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/docbook.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'docbook', @@ -156,10 +160,10 @@ elinkskeys_5_xml = custom_target('elinkskeys.5.xml', input: 'elinkskeys.5.txt', output: 'elinkskeys.5.xml', depends: [keymap_actions_txt, keymap_defaults_txt], - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/docbook.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/docbook.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'docbook', @@ -169,10 +173,10 @@ elinkskeys_5_xml = custom_target('elinkskeys.5.xml', hacking_xml = custom_target('hacking.xml', input: 'hacking.txt', output: 'hacking.xml', - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/docbook.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/docbook.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'docbook', @@ -182,10 +186,10 @@ manual_xml = custom_target('manual.xml', input: 'manual.txt', output: 'manual.xml', depends: features_txt, - command: ['@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.py', - '--no-conf', '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/asciidoc.conf', - '-f', '@CURRENT_SOURCE_DIR@/tools/asciidoc/docbook.conf', - '-f', '@CURRENT_SOURCE_DIR@/asciidoc.conf', + command: [meson.current_source_dir() + '/tools/asciidoc/asciidoc.py', + '--no-conf', '-f', meson.current_source_dir() + '/tools/asciidoc/asciidoc.conf', + '-f', meson.current_source_dir() + '/tools/asciidoc/docbook.conf', + '-f', meson.current_source_dir() + '/asciidoc.conf', '-a', 'builddir='+meson.current_build_dir()+'/', '-a', 'elinks_version='+meson.project_version(), '-b', 'docbook', @@ -237,7 +241,8 @@ if doxygen.found() doxygen_api = custom_target('api', input: [], output: 'api', - command: ['OUTPUT_DIRECTORY='+meson.current_build_dir()+'/', doxygen, meson.current_build_dir()+'/Doxyfile']) + env: ['OUTPUT_DIRECTORY='+meson.current_build_dir()+'/'], + command: [doxygen, meson.current_build_dir()+'/Doxyfile']) endif txt = alias_target('txt', elinks, features_txt, keymap_actions_txt, keymap_defaults_txt)