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
...@@ -12,20 +12,27 @@ intermediate = asdf.cps asdf.log asdf.vr asdf.aux asdf.fn asdf.toc asdf.vrs \ ...@@ -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 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 manual-html: asdf.texinfo
makeinfo --html asdf.texinfo \ @echo "makeinfo --html asdf.texinfo"
2>&1 > manual-html.log || { echo "failed. See log in manual-html.log" ; exit 1 ;} @makeinfo --html asdf.texinfo \
$(log_output)
asdf.html: asdf.texinfo asdf.html: asdf.texinfo
makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \ @echo "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 ;} @makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \
$(log_output)
asdf.info: asdf.texinfo asdf.info: asdf.texinfo
makeinfo asdf.texinfo @echo "makeinfo asdf.texinfo"
@makeinfo asdf.texinfo \
$(log_output)
asdf.pdf: asdf.texinfo asdf.pdf: asdf.texinfo
texi2pdf asdf.texinfo \ @echo "texi2pdf asdf.texinfo"
2>&1 > asdf.pdf.log || { echo "failed. See log in asdf.pdf.log" ; exit 1 ;} @texi2pdf asdf.texinfo \
$(log_output)
website: all website: all
rsync -lt --no-g ${webfiles} ${website} rsync -lt --no-g ${webfiles} ${website}
......
...@@ -17,6 +17,7 @@ Regression test: ...@@ -17,6 +17,7 @@ Regression test:
- make - make
- make test - make test
artifacts: artifacts:
when: always
paths: paths:
- build/results/$l-test.text - build/results/$l-test.text
needs: [] needs: []
...@@ -34,6 +35,7 @@ REQUIRE Upgrade test: ...@@ -34,6 +35,7 @@ REQUIRE Upgrade test:
- make - make
- make test-upgrade - make test-upgrade
artifacts: artifacts:
when: always
paths: paths:
- build/results/$l-upgrade.text - build/results/$l-upgrade.text
needs: [] needs: []
......
...@@ -31,6 +31,7 @@ Build ASDF: ...@@ -31,6 +31,7 @@ Build ASDF:
script: script:
- make - make
artifacts: artifacts:
when: always
paths: paths:
- build/asdf.lisp - build/asdf.lisp
...@@ -42,10 +43,12 @@ Build docs: ...@@ -42,10 +43,12 @@ Build docs:
- apt-get install -y --no-install-recommends texinfo texlive - apt-get install -y --no-install-recommends texinfo texlive
- make -C doc - make -C doc
artifacts: artifacts:
when: always
paths: paths:
- doc/asdf.html - doc/asdf.html
- doc/asdf.info - doc/asdf.info
- doc/asdf.pdf - doc/asdf.pdf
- doc/*.log
############################################################################### ###############################################################################
# Regression tests # Regression tests
...@@ -60,6 +63,7 @@ Build docs: ...@@ -60,6 +63,7 @@ Build docs:
- make - make
- make test - make test
artifacts: artifacts:
when: always
paths: paths:
- build/results/$l-test.text - build/results/$l-test.text
needs: [] needs: []
...@@ -98,6 +102,7 @@ Regression test expected failure: ...@@ -98,6 +102,7 @@ Regression test expected failure:
- make - make
- make test-upgrade - make test-upgrade
artifacts: artifacts:
when: always
paths: paths:
- build/results/$l-upgrade.text - build/results/$l-upgrade.text
needs: [] 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