From 758fc7d33141fb0047c5b702429e33e120d33462 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 26 Oct 2016 08:46:26 +0200 Subject: [PATCH 1/2] travis/clang-analyze: look for dist tarball in build/ --- travis/clang-analyze.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/clang-analyze.sh b/travis/clang-analyze.sh index 97c11fcc..5ef390d3 100755 --- a/travis/clang-analyze.sh +++ b/travis/clang-analyze.sh @@ -4,6 +4,6 @@ set -e set -x mkdir -p deb/DIST-clang/build -tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1 +tar xf build/*.tar.bz2 -C deb/DIST-clang --strip-components=1 (cd deb/DIST-clang/build && scan-build -o ../../CLANG ../configure && scan-build -o ../../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8) mv deb/CLANG/*/* deb/CLANG From b10eb0c3e6878b08b3b59f44f76e3847a64aab4f Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 26 Oct 2016 08:46:39 +0200 Subject: [PATCH 2/2] travis/docs.sh: call asciidoc directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …instead of the no longer existing docs-clean and docs targets. --- travis/docs.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/travis/docs.sh b/travis/docs.sh index 35bc12bb..d452e9b6 100755 --- a/travis/docs.sh +++ b/travis/docs.sh @@ -3,9 +3,14 @@ set -e set -x -make clean-docs docs ASCIIDOC="asciidoc -a linkcss -a stylesdir=http://i3wm.org/css -a scriptsdir=http://i3wm.org/js --backend=xhtml11 -f docs/asciidoc-git.conf" +for f in $(grep '\.html$' debian/i3-wm.docs | grep -v 'docs/refcard.html' | grep -v 'docs/lib-i3test') +do + asciidoc -a linkcss -a stylesdir=http://i3wm.org/css -a scriptsdir=http://i3wm.org/js --backend=xhtml11 -f docs/asciidoc-git.conf $(dirname $f)/$(basename $f .html) +done ./docs/i3-pod2html i3-dmenu-desktop man/i3-dmenu-desktop.html ./docs/i3-pod2html i3-save-tree man/i3-save-tree.html +./docs/i3-pod2html build/testcases/lib/i3test.pm docs/lib-i3test.html +./docs/i3-pod2html testcases/lib/i3test/Test.pm docs/lib-i3test-test.html for file in $(sed 's/\.1$/.man/g' debian/i3-wm.manpages) do [ -f "$file" ] && asciidoc -a linkcss -a stylesdir=http://i3wm.org/css -a scriptsdir=http://i3wm.org/js --backend=xhtml11 -f docs/asciidoc-git.conf "$file"