projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f24fcd2
)
asciidoc -> asciidoctor.
author
Eric S. Raymond
<esr@thyrsus.com>
Sun, 4 Feb 2024 20:52:03 +0000
(15:52 -0500)
committer
Eric S. Raymond
<esr@thyrsus.com>
Sun, 4 Feb 2024 20:52:03 +0000
(15:52 -0500)
Dockerfile.ci
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
diff --git
a/Dockerfile.ci
b/Dockerfile.ci
index 598687b9dd130f496b12645e1d43056b70f4271d..b8eeef58e2f40f3ab93f2cae4243bfd90ed17c9f 100644
(file)
--- a/
Dockerfile.ci
+++ b/
Dockerfile.ci
@@
-9,4
+9,4
@@
FROM ubuntu
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
-RUN apt-get install --yes --no-install-recommends make gcc
-10 libedit-dev libasan6 libubsan1 python3 python3-yaml lcov asciidoc
libxslt1.1 pkg-config docbook-xml xsltproc
+RUN apt-get install --yes --no-install-recommends make gcc
libedit-dev libasan6 libubsan1 python3 python3-yaml lcov asciidoctor
libxslt1.1 pkg-config docbook-xml xsltproc
diff --git
a/Makefile
b/Makefile
index 978d5a8912c927cd7ffdf33191d22c8015e49e7d..ea8fcd4732497d47ac75c616fe69d2d9de50da21 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-87,15
+87,16
@@
reflow:
coverage: clean debug
cd tests; $(MAKE) coverage --quiet
coverage: clean debug
cd tests; $(MAKE) coverage --quiet
-.SUFFIXES: .adoc .html .6
+# Note: to suppress the footers with timestamps being generated in HTML,
+# we use "-a nofooter".
+# To debug asciidoc problems, you may need to run "xmllint --nonet --noout --valid"
+# on the intermediate XML that throws an error.
+.SUFFIXES: .html .adoc .6
-# Requires asciidoc and xsltproc/docbook stylesheets.
.adoc.6:
.adoc.6:
- a
2x --doctype manpage --format
manpage $<
+ a
sciidoctor -D. -a nofooter -b
manpage $<
.adoc.html:
.adoc.html:
- asciidoc $<
-.adoc:
- asciidoc $<
+ asciidoctor -D. -a nofooter -a webfonts! $<
html: advent.html history.html hints.html
html: advent.html history.html hints.html