Commit 1c997636 authored by Robert Goldman's avatar Robert Goldman
Browse files

Merge branch 'doc-makefile' into 'master'

rewrite docs makefile for less spurious error-looking output

See merge request !182
parents 394d6122 af987303
Pipeline #4025 passed with stage
......@@ -12,20 +12,27 @@ intermediate = asdf.cps asdf.log asdf.vr asdf.aux asdf.fn asdf.toc asdf.vrs \
all: asdf.html asdf.info asdf.pdf manual-html
log_output = > $@.log 2>&1 || { echo " failed. See log in $@.log" ; exit 1 ;}
manual-html: asdf.texinfo
makeinfo --html asdf.texinfo \
2>&1 > manual-html.log || { echo "failed. See log in manual-html.log" ; exit 1 ;}
@echo "makeinfo --html asdf.texinfo"
@makeinfo --html asdf.texinfo \
$(log_output)
asdf.html: asdf.texinfo
makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \
2>&1 > asdf.html.log || { echo "failed. See log in asdf.html.log" ; exit 1 ;}
@echo "makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo"
@makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \
$(log_output)
asdf.info: asdf.texinfo
makeinfo asdf.texinfo
@echo "makeinfo asdf.texinfo"
@makeinfo asdf.texinfo \
$(log_output)
asdf.pdf: asdf.texinfo
texi2pdf asdf.texinfo \
2>&1 > asdf.pdf.log || { echo "failed. See log in asdf.pdf.log" ; exit 1 ;}
@echo "texi2pdf asdf.texinfo"
@texi2pdf asdf.texinfo \
$(log_output)
website: all
rsync -lt --no-g ${webfiles} ${website}
......
......@@ -17,6 +17,7 @@ Regression test:
- make
- make test
artifacts:
when: always
paths:
- build/results/$l-test.text
needs: []
......@@ -34,6 +35,7 @@ REQUIRE Upgrade test:
- make
- make test-upgrade
artifacts:
when: always
paths:
- build/results/$l-upgrade.text
needs: []
......
......@@ -31,6 +31,7 @@ Build ASDF:
script:
- make
artifacts:
when: always
paths:
- build/asdf.lisp
......@@ -42,10 +43,12 @@ Build docs:
- apt-get install -y --no-install-recommends texinfo texlive
- make -C doc
artifacts:
when: always
paths:
- doc/asdf.html
- doc/asdf.info
- doc/asdf.pdf
- doc/*.log
###############################################################################
# Regression tests
......@@ -60,6 +63,7 @@ Build docs:
- make
- make test
artifacts:
when: always
paths:
- build/results/$l-test.text
needs: []
......@@ -98,6 +102,7 @@ Regression test expected failure:
- make
- make test-upgrade
artifacts:
when: always
paths:
- build/results/$l-upgrade.text
needs: []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment