Skip to content

Commit a1d0f45

Browse files
committed
Switching to Asciidoctor for man page generation
1 parent 7ec473b commit a1d0f45

File tree

8 files changed

+1769
-1302
lines changed

8 files changed

+1769
-1302
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
99
- Terminal output is now in color when supported by the terminal. Because it is 2026.
1010
`NO_COLOR` and `FORCE_COLOR` environment variables are fully supported too.
1111
- Command line help now wraps correctly at the terminal edge
12+
- Manpage is now generated using Asciidoctor.
1213
- Updated 3rd party dependencies
1314

1415
### Fixed

CMakeLists.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,26 +279,25 @@ add_custom_command(
279279
VERBATIM
280280
)
281281

282-
if (PANDOC_PATH)
282+
if (ASCIIDOCTOR_PATH)
283283

284284
add_custom_command(
285285
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8
286-
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.md
287-
COMMAND ${PANDOC_PATH} --standalone --to man ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.md -o ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8
286+
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.adoc
287+
COMMAND ${ASCIIDOCTOR_PATH} -b manpage ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.adoc -o ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8
288288
VERBATIM
289289
)
290290

291-
endif()
292-
293-
if (GROFF_PATH)
294291
add_custom_command(
295292
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.html
296-
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8
297-
COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8 | ${GROFF_PATH} -mandoc -Thtml > ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.html
293+
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.adoc
294+
COMMAND ${ASCIIDOCTOR_PATH} -a doctype=article ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.adoc -o ${CMAKE_CURRENT_SOURCE_DIR}/doc/wsddn.8.html
298295
VERBATIM
299296
)
297+
300298
endif()
301299

300+
302301
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND NOT WSDDN_MACOS_SUPPRESS_WRAPPER)
303302

304303
add_subdirectory(installers/mac/wrapper wrapper)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ Log file is located at `/var/log/wsddn.log`. Log file rotation is configured via
523523

524524
### FreeBSD
525525

526-
Pre-built packages are available for FreeBSD 13, 14 and 15 in a custom binary package repository.
526+
Pre-built packages are available for FreeBSD 14 and 15 in a custom binary package repository.
527527
Both `amd64` (aka `x86_64`) and `arm64` (aka `aarch64`) architectures are supported.
528528

529529
<details>

cmake/detect_system.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,4 @@ if (WSDDN_WITH_SYSTEMD STREQUAL "yes" OR WSDDN_WITH_SYSTEMD STREQUAL "auto" AND
193193
endif()
194194

195195

196-
find_program(PANDOC_PATH pandoc)
197-
find_program(GROFF_PATH groff)
196+
find_program(ASCIIDOCTOR_PATH asciidoctor)

0 commit comments

Comments
 (0)