From aea9c334e0f4842d78f3b849079bfb318d4f6937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Tue, 31 Dec 2024 23:52:59 +0100 Subject: [PATCH] Bump liberty, replace help2man with help2adoc --- CMakeLists.txt | 30 +++++++++++++++++++----------- README.adoc | 2 +- liberty | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8beaf96..2e91b48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,19 +138,27 @@ endif () # Generate documentation from help output if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) - find_program (HELP2MAN_EXECUTABLE help2man) - if (NOT HELP2MAN_EXECUTABLE) - message (FATAL_ERROR "help2man not found") - endif () + set (HELP2ADOC "${PROJECT_SOURCE_DIR}/liberty/tools/help2adoc.awk") + set (ASCIIMAN "${PROJECT_SOURCE_DIR}/liberty/tools/asciiman.awk") foreach (target ${targets}) - set (page_output "${PROJECT_BINARY_DIR}/${target}.1") - list (APPEND project_MAN_PAGES "${page_output}") - add_custom_command (OUTPUT ${page_output} - COMMAND ${HELP2MAN_EXECUTABLE} -N - "${PROJECT_BINARY_DIR}/${target}" -o ${page_output} - DEPENDS ${target} - COMMENT "Generating man page for ${target}" VERBATIM) + set (page_adoc "${PROJECT_BINARY_DIR}/${target}.1.adoc") + set (page_roff "${PROJECT_BINARY_DIR}/${target}.1") + list (APPEND project_MAN_PAGES "${page_roff}") + + # $ could be used, if we didn't have to escape it. + string (REPLACE "\\" "\\\\" + target_path "${PROJECT_BINARY_DIR}/${target}") + add_custom_command (OUTPUT "${page_adoc}" + COMMAND env LC_ALL=C awk -f "${HELP2ADOC}" + -v "Target=${target_path}" > "${page_adoc}" + DEPENDS "${target}" "${HELP2ADOC}" + COMMENT "Generating AsciiDoc man page for ${target}" VERBATIM) + add_custom_command (OUTPUT "${page_roff}" + COMMAND env LC_ALL=C awk -f "${ASCIIMAN}" + "${page_adoc}" > "${page_roff}" + DEPENDS "${page_adoc}" "${ASCIIMAN}" + COMMENT "Generating roff man page for ${target}" VERBATIM) endforeach () add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES}) diff --git a/README.adoc b/README.adoc index 83d859e..99f8c74 100644 --- a/README.adoc +++ b/README.adoc @@ -59,7 +59,7 @@ https://git.janouch.name/p/usb-drivers/releases[the Releases page on Gitea]. Building -------- Build dependencies: - CMake, pkg-config, liberty (included), help2man + + CMake, pkg-config, liberty (included) + Runtime dependencies: libusb-1.0 (elksmart-comm, razer-bw-te-ctl), hidapi >= 0.14 (eizoctl) diff --git a/liberty b/liberty index 1930f13..9268fb8 160000 --- a/liberty +++ b/liberty @@ -1 +1 @@ -Subproject commit 1930f138d4836f8ed9613a17bfe09dc53441618a +Subproject commit 9268fb8eba4a60499809965b3b69c2eb7e3798e7