p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Bump liberty, make use of its new asciiman.awk

This commit is contained in:
Přemysl Eric Janouch 2022-09-25 21:24:00 +02:00
parent 022668fb23
commit 4ed58dd89a
Signed by: p
GPG Key ID: A0420B94F92B9493
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -99,7 +99,8 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor) find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
find_program (A2X_EXECUTABLE a2x) find_program (A2X_EXECUTABLE a2x)
if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE) if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE)
message (FATAL_ERROR "Neither asciidoctor nor a2x were found") message (WARNING "Neither asciidoctor nor a2x were found, "
"falling back to a substandard manual page generator")
endif () endif ()
foreach (page ${PROJECT_NAME}) foreach (page ${PROJECT_NAME})
@ -121,6 +122,13 @@ foreach (page ${PROJECT_NAME})
"${PROJECT_SOURCE_DIR}/${page}.adoc" "${PROJECT_SOURCE_DIR}/${page}.adoc"
DEPENDS ${page}.adoc DEPENDS ${page}.adoc
COMMENT "Generating man page for ${page}" VERBATIM) COMMENT "Generating man page for ${page}" VERBATIM)
else ()
set (ASCIIMAN ${PROJECT_SOURCE_DIR}/liberty/tools/asciiman.awk)
add_custom_command (OUTPUT ${page_output}
COMMAND env LC_ALL=C awk -f ${ASCIIMAN}
"${PROJECT_SOURCE_DIR}/${page}.adoc" > ${page_output}
DEPENDS ${page}.adoc ${ASCIIMAN}
COMMENT "Generating man page for ${page}" VERBATIM)
endif () endif ()
endforeach () endforeach ()

8
README.adoc
View File

@ -34,10 +34,10 @@ a package with the latest development version from Archlinux's AUR.
Building Building
-------- --------
Build dependencies: CMake, pkg-config, asciidoctor or asciidoc, Build dependencies: CMake, pkg-config, liberty (included),
liberty (included), http-parser (included) + http-parser (included), asciidoctor or asciidoc (recommended but optional) +
Runtime dependencies: libev, Jansson, cURL, openssl, Runtime dependencies:
readline or libedit >= 2013-07-12, libev, Jansson, cURL, openssl, readline or libedit >= 2013-07-12
$ git clone --recursive https://git.janouch.name/p/json-rpc-shell.git $ git clone --recursive https://git.janouch.name/p/json-rpc-shell.git
$ mkdir json-rpc-shell/build $ mkdir json-rpc-shell/build

2
liberty

@ -1 +1 @@
Subproject commit d71c47f8ce7aecdc4856630e9d73a48912be68c1 Subproject commit 688c458095974fcd85b2f92c6b5380edfb564398