diff --git a/docs/build_docs.sh b/docs/build_docs.sh deleted file mode 100755 index 2054978626..0000000000 --- a/docs/build_docs.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -xeo pipefail - -if [ ! -d "virtualenv" ] -then - virtualenv -p python2.7 virtualenv -fi - -( - . virtualenv/bin/activate - if [ ! -d "virtualenv/lib/python2.7/site-packages/sphinx" ] - then - pip install -r requirements.txt - fi - make html -) diff --git a/scripts/generate-docsite.sh b/docs/generate-docsite.sh old mode 100755 new mode 100644 similarity index 83% rename from scripts/generate-docsite.sh rename to docs/generate-docsite.sh index 5ccfa60c3a..21f17811f2 --- a/scripts/generate-docsite.sh +++ b/docs/generate-docsite.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -xeo pipefail + if [ ! -e ./gradlew ]; then echo "Run from the root directory please" exit 1 @@ -11,10 +13,15 @@ if [ ! -e lib/dokka.jar ]; then wget -O lib/dokka.jar https://github.com/Kotlin/dokka/releases/download/0.9.8/dokka-fatjar.jar fi +echo "Installing pip dependencies ... " +echo +cd docs +pip install -r requirements.txt; + echo "Generating docsite ..." echo -( cd docs; make clean html ) +make clean html echo echo "Generating API docs ..." diff --git a/docs/source/building-the-docs.rst b/docs/source/building-the-docs.rst index 38d8401f03..5d5677ee5d 100644 --- a/docs/source/building-the-docs.rst +++ b/docs/source/building-the-docs.rst @@ -38,7 +38,7 @@ documentation by running the following script: .. sourcecode:: shell - scripts/generate-docsite.sh + docs/generate-docsite.sh Alternatively you can build non-HTML formats from the ``docs`` folder. Change directory to the folder and then run the following to see a list of all available formats: