Propagate default values from configure.ac to asciidoc.conf

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/.gitignore b/.gitignore
index 445e76919cc4ed9d4a5feaed0f63e5b0204add01..f9fd809e28dc8c5e83c14113c42e9d7a247cde89 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -113,6 +113,7 @@ tests/regression/ust/python-logging/test_python_logging
 /doc/man/*.8
 /doc/man/*.xml
 /doc/man/*.html
+/doc/man/asciidoc.conf
 !/doc/man/lttng-health-check.3
 
 /benchmark/

diff --git a/configure.ac b/configure.ac
index 1d0cf29a7d29cb02ded556046ace0a0eae6487fa..240d1efba8d5970842fc2c253aa87ecb0cf24bdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -907,6 +907,7 @@ AC_CONFIG_FILES([
        Makefile
        doc/Makefile
        doc/man/Makefile
+       doc/man/asciidoc.conf
        include/Makefile
        extras/Makefile
        extras/bindings/Makefile

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index eca1cb20f4ee4b3409e8ba0a5fd02aab6e3fb586..fca79c9d6adce445c682cdf15a31457d97bb5204 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -144,4 +144,4 @@ dist-hook:
 endif # !MAN_PAGES_OPT
 
 # always distribute the source files
-EXTRA_DIST = $(MAN_TXT) $(COMMON_TXT) $(XSL_SRC_FILES) $(ASCIIDOC_CONF)
+EXTRA_DIST = $(MAN_TXT) $(COMMON_TXT) $(XSL_SRC_FILES) $(ASCIIDOC_CONF).in

diff --git a/doc/man/asciidoc.conf b/doc/man/asciidoc.conf
deleted file mode 100644 (file)
index 70bd7d6..0000000
--- a/doc/man/asciidoc.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-[macros]
-
-# man macro
-#
-# Inspired by linkgit macro:
-# <https://github.com/git/git/blob/master/Documentation/asciidoc.conf>
-#
-# Usage: man:command(manpage-section)
-(?su)[\\]?(?P<name>man):(?P<target>\S*?)\((?P<attrlist>.*?)\)=
-
-# linkgenoptions macro
-#
-# Usage: linkgenoptions:(text)
-(?su)[\\]?(?P<name>linkgenoptions):\((?P<text>.*?)\)=
-
-# no link option macro
-#
-# Usage: nloption:--option-name
-(?su)[\\]?(?P<name>nloption):(?P<opt>--?[a-zA-Z0-9-]*)=
-
-# lttng(1) general option macro
-#
-# Usage: genoption:--option-name
-(?su)[\\]?(?P<name>genoption):(?P<opt>--?[a-zA-Z0-9-]*)=
-
-# option macro
-#
-# Usage: option:--option-name
-(?su)[\\]?(?P<name>option):(?P<opt>--?[a-zA-Z0-9-]*)=
-
-# not macro
-#
-# Usage: :not:
-:not:=not
-
-# escwc macro
-#
-# Usage: :escwc:
-:escwc:=escwc
-
-# man macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[man-inlinemacro]
-{0%{target}}
-{0#<citerefentry>}
-{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
-{0#</citerefentry>}
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# linkgenoptions macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[linkgenoptions-inlinemacro]
-{text}
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# option macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[option-inlinemacro]
-<literal>{opt}</literal>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# no link option macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[nloption-inlinemacro]
-<literal>{opt}</literal>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# lttng(1) general option macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[genoption-inlinemacro]
-<literal>{opt}</literal>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# not macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[not-inlinemacro]
-NOT
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# escwc macro expansions
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[escwc-inlinemacro]
-<literal>\e*</literal>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-# configure XML man page header
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[header]
-template::[header-declarations]
-<refentry>
-<refmeta>
-<refentrytitle>{mantitle}</refentrytitle>
-<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">LTTng</refmiscinfo>
-<refmiscinfo class="version">{lttng_version}</refmiscinfo>
-<refmiscinfo class="manual">LTTng Manual</refmiscinfo>
-</refmeta>
-<refnamediv>
-  <refname>{manname}</refname>
-  <refpurpose>{manpurpose}</refpurpose>
-</refnamediv>
-endif::backend-docbook[]
-endif::doctype-manpage[]

diff --git a/doc/man/asciidoc.conf.in b/doc/man/asciidoc.conf.in
new file mode 100644 (file)
index 0000000..b264bc6
--- /dev/null
+++ b/doc/man/asciidoc.conf.in
@@ -0,0 +1,153 @@
+[macros]
+
+# man macro
+#
+# Inspired by linkgit macro:
+# <https://github.com/git/git/blob/master/Documentation/asciidoc.conf>
+#
+# Usage: man:command(manpage-section)
+(?su)[\\]?(?P<name>man):(?P<target>\S*?)\((?P<attrlist>.*?)\)=
+
+# linkgenoptions macro
+#
+# Usage: linkgenoptions:(text)
+(?su)[\\]?(?P<name>linkgenoptions):\((?P<text>.*?)\)=
+
+# no link option macro
+#
+# Usage: nloption:--option-name
+(?su)[\\]?(?P<name>nloption):(?P<opt>--?[a-zA-Z0-9-]*)=
+
+# lttng(1) general option macro
+#
+# Usage: genoption:--option-name
+(?su)[\\]?(?P<name>genoption):(?P<opt>--?[a-zA-Z0-9-]*)=
+
+# option macro
+#
+# Usage: option:--option-name
+(?su)[\\]?(?P<name>option):(?P<opt>--?[a-zA-Z0-9-]*)=
+
+# not macro
+#
+# Usage: :not:
+:not:=not
+
+# escwc macro
+#
+# Usage: :escwc:
+:escwc:=escwc
+
+# man macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[man-inlinemacro]
+{0%{target}}
+{0#<citerefentry>}
+{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
+{0#</citerefentry>}
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# linkgenoptions macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[linkgenoptions-inlinemacro]
+{text}
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# option macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[option-inlinemacro]
+<literal>{opt}</literal>
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# no link option macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[nloption-inlinemacro]
+<literal>{opt}</literal>
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# lttng(1) general option macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[genoption-inlinemacro]
+<literal>{opt}</literal>
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# not macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[not-inlinemacro]
+NOT
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# escwc macro expansions
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[escwc-inlinemacro]
+<literal>\e*</literal>
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+# configure XML man page header
+ifdef::doctype-manpage[]
+ifdef::backend-docbook[]
+[header]
+template::[header-declarations]
+<refentry>
+<refmeta>
+<refentrytitle>{mantitle}</refentrytitle>
+<manvolnum>{manvolnum}</manvolnum>
+<refmiscinfo class="source">LTTng</refmiscinfo>
+<refmiscinfo class="version">{lttng_version}</refmiscinfo>
+<refmiscinfo class="manual">LTTng Manual</refmiscinfo>
+</refmeta>
+<refnamediv>
+  <refname>{manname}</refname>
+  <refpurpose>{manpurpose}</refpurpose>
+</refnamediv>
+endif::backend-docbook[]
+endif::doctype-manpage[]
+
+[attributes]
+default_agent_tcp_port="@DEFAULT_AGENT_TCP_PORT@"
+default_app_socket_rw_timeout="@DEFAULT_APP_SOCKET_RW_TIMEOUT@"
+default_channel_subbuf_size="@DEFAULT_CHANNEL_SUBBUF_SIZE@"
+default_channel_tracefile_count="@DEFAULT_CHANNEL_TRACEFILE_COUNT@"
+default_channel_tracefile_size="@DEFAULT_CHANNEL_TRACEFILE_SIZE@"
+default_kernel_channel_live_timer="@DEFAULT_KERNEL_CHANNEL_LIVE_TIMER@"
+default_kernel_channel_read_timer="@DEFAULT_KERNEL_CHANNEL_READ_TIMER@"
+default_kernel_channel_subbuf_num="@DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM@"
+default_kernel_channel_subbuf_size="@DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE@"
+default_kernel_channel_switch_timer="@DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER@"
+default_lttng_live_timer="@DEFAULT_LTTNG_LIVE_TIMER@"
+default_metadata_cache_size="@DEFAULT_METADATA_CACHE_SIZE@"
+default_metadata_read_timer="@DEFAULT_METADATA_READ_TIMER@"
+default_metadata_subbuf_num="@DEFAULT_METADATA_SUBBUF_NUM@"
+default_metadata_subbuf_size="@DEFAULT_METADATA_SUBBUF_SIZE@"
+default_metadata_switch_timer="@DEFAULT_METADATA_SWITCH_TIMER@"
+default_network_control_port="@DEFAULT_NETWORK_CONTROL_PORT@"
+default_network_data_port="@DEFAULT_NETWORK_DATA_PORT@"
+default_network_viewer_port="@DEFAULT_NETWORK_VIEWER_PORT@"
+default_ust_pid_channel_live_timer="@DEFAULT_UST_PID_CHANNEL_LIVE_TIMER@"
+default_ust_pid_channel_read_timer="@DEFAULT_UST_PID_CHANNEL_READ_TIMER@"
+default_ust_pid_channel_subbuf_num="@DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM@"
+default_ust_pid_channel_subbuf_size="@DEFAULT_UST_PID_CHANNEL_SUBBUF_SIZE@"
+default_ust_pid_channel_switch_timer="@DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER@"
+default_ust_uid_channel_live_timer="@DEFAULT_UST_UID_CHANNEL_LIVE_TIMER@"
+default_ust_uid_channel_read_timer="@DEFAULT_UST_UID_CHANNEL_READ_TIMER@"
+default_ust_uid_channel_subbuf_num="@DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM@"
+default_ust_uid_channel_subbuf_size="@DEFAULT_UST_UID_CHANNEL_SUBBUF_SIZE@"
+default_ust_uid_channel_switch_timer="@DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER@"
+default_agent_bind_address="@DEFAULT_AGENT_BIND_ADDRESS@"
+default_network_control_bind_address="@DEFAULT_NETWORK_CONTROL_BIND_ADDRESS@"
+default_network_data_bind_address="@DEFAULT_NETWORK_DATA_BIND_ADDRESS@"
+default_network_viewer_bind_address="@DEFAULT_NETWORK_VIEWER_BIND_ADDRESS@"