openstack/devstack
Code Issues Proposed changes

Robustify shocco install and config

Browse Source 
* shocco has some non-optional prereqs, make sure they are present if
shocco is being installed
* set the path to installed shocco correctly
* add the working dir to .gitignore

Change-Id: If786ea9e28d3595775f7b86d2fe760dff8047f49
This commit is contained in:
Dean Troyer 2013-11-06 02:15:11 -06:00
parent aa50a13135
commit c04ddbe868
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,5 +13,6 @@ stack-screenrc
accrc accrc
.stackenv .stackenv
.prereqs .prereqs
devstack-docs-*
docs/ docs/
docs-files docs-files

13
tools/build_docs.sh
View File

@ -28,22 +28,31 @@ MASTER_BRANCH=${MASTER_BRANCH:-master}
# http://devstack.org is a GitHub gh-pages site in the https://github.com/cloudbuilders/devtack.git repo # http://devstack.org is a GitHub gh-pages site in the https://github.com/cloudbuilders/devtack.git repo
GH_PAGES_REPO=git@github.com:cloudbuilders/devstack.git GH_PAGES_REPO=git@github.com:cloudbuilders/devstack.git
# Keep track of the devstack directory
TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
# Uses this shocco branch: https://github.com/dtroyer/shocco/tree/rst_support # Uses this shocco branch: https://github.com/dtroyer/shocco/tree/rst_support
SHOCCO=${SHOCCO:-shocco} SHOCCO=${SHOCCO:-shocco}
if ! which shocco; then if ! which shocco; then
if [[ ! -x shocco/shocco ]]; then if [[ ! -x $TOP_DIR/shocco/shocco ]]; then
if [[ -z "$INSTALL_SHOCCO" ]]; then if [[ -z "$INSTALL_SHOCCO" ]]; then
echo "shocco not found in \$PATH, please set environment variable SHOCCO" echo "shocco not found in \$PATH, please set environment variable SHOCCO"
exit 1 exit 1
fi fi
echo "Installing local copy of shocco" echo "Installing local copy of shocco"
if ! which pygmentize; then
sudo pip install Pygments
fi
if ! which rst2html.py; then
sudo pip install docutils
fi
git clone -b rst_support https://github.com/dtroyer/shocco shocco git clone -b rst_support https://github.com/dtroyer/shocco shocco
cd shocco cd shocco
./configure ./configure
make make
cd .. cd ..
fi fi
SHOCCO=shocco/shocco SHOCCO=$TOP_DIR/shocco/shocco
fi fi
# Process command-line args # Process command-line args