diff options
| author | Jack Lloyd <[email protected]> | 2017-03-23 16:01:52 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-03-23 16:01:52 -0400 |
| commit | 4e9ffc2027db67ac144860c7f87fac94966d3a97 (patch) | |
| tree | e3085e91c9f6ce42a8205c36a52aa86bbbca0a27 | |
| parent | 9474d89970157f7a6c6bdc5044025170a90f27b2 (diff) | |
| parent | 23c30819762bd841fb920452167b0b731aa4535c (diff) | |
Merge GH #937 Fix pdf download URL [ci skip]
| -rw-r--r-- | doc/manual/index.rst | 2 | ||||
| -rwxr-xr-x | src/scripts/website.sh | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/doc/manual/index.rst b/doc/manual/index.rst index b27761d37..a38624a9c 100644 --- a/doc/manual/index.rst +++ b/doc/manual/index.rst @@ -12,7 +12,7 @@ source may not be required on your system. .. only:: html and website - You can also download this manual as a :download:`PDF <../../latex/botan.pdf>`. + You can also download this manual as a `PDF <https://botan.randombit.net/manual/botan.pdf>`_. Books and other references ---------------------------- diff --git a/src/scripts/website.sh b/src/scripts/website.sh index 3b81b88e9..847db531e 100755 --- a/src/scripts/website.sh +++ b/src/scripts/website.sh @@ -3,7 +3,6 @@ set -e which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if available SPHINX_CONFIG=./src/build-data/sphinx -SPHINX_BUILDER="html" WEBSITE_DIR=./www-botan WEBSITE_SRC_DIR=./www-src @@ -11,26 +10,25 @@ WEBSITE_SRC_DIR=./www-src rm -rf $WEBSITE_SRC_DIR $WEBSITE_DIR mkdir -p $WEBSITE_SRC_DIR -# build manual as pdf for download -sphinx-build -t website -c "$SPHINX_CONFIG" -b "latex" doc/manual latex -cd latex -pdflatex botan.tex -cd .. - # build online manual cp readme.rst $WEBSITE_SRC_DIR/index.rst cp -r news.rst doc/security.rst $WEBSITE_SRC_DIR echo -e ".. toctree::\n\n index\n news\n security\n" > $WEBSITE_SRC_DIR/contents.rst -sphinx-build -t website -c "$SPHINX_CONFIG" -b "$SPHINX_BUILDER" $WEBSITE_SRC_DIR $WEBSITE_DIR -sphinx-build -t website -c "$SPHINX_CONFIG" -b "$SPHINX_BUILDER" doc/manual $WEBSITE_DIR/manual +sphinx-build -t website -c "$SPHINX_CONFIG" -b "html" $WEBSITE_SRC_DIR $WEBSITE_DIR +sphinx-build -t website -c "$SPHINX_CONFIG" -b "html" doc/manual $WEBSITE_DIR/manual rm -rf $WEBSITE_DIR/.doctrees rm -f $WEBSITE_DIR/.buildinfo rm -rf $WEBSITE_DIR/manual/.doctrees rm -f $WEBSITE_DIR/manual/.buildinfo cp license.txt doc/pgpkey.txt $WEBSITE_DIR - +# build manual as pdf for download +sphinx-build -t website -c "$SPHINX_CONFIG" -b "latex" doc/manual latex +cd latex +pdflatex botan.tex +cd .. +cp latex/botan.pdf $WEBSITE_DIR/manual/botan.pdf # build doxygen doxygen build/botan.doxy |