Move the doc paths to match other repos
In order to build in the Infra system, we'd like to be able to reuse the existing doc build macros. To support that, move docs/source to doc/source and docs/html to doc/build/html. Change-Id: Ibd8e8e82e54c69b182120df67e6ec6908fed2908
Monty Taylor
Anita Kuno
4
.gitignore
vendored
@ -8,8 +8,8 @@
|
|||||||
.tox
|
.tox
|
||||||
.stackenv
|
.stackenv
|
||||||
accrc
|
accrc
|
||||||
docs/files
|
doc/files
|
||||||
docs/html
|
doc/build
|
||||||
files/*.gz
|
files/*.gz
|
||||||
files/*.qcow2
|
files/*.qcow2
|
||||||
files/images
|
files/images
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1014 B After Width: | Height: | Size: 1014 B |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
# - Install shocco if not found on PATH and INSTALL_SHOCCO is set
|
# - Install shocco if not found on PATH and INSTALL_SHOCCO is set
|
||||||
# - Clone MASTER_REPO branch MASTER_BRANCH
|
# - Clone MASTER_REPO branch MASTER_BRANCH
|
||||||
# - Re-creates ``docs/html`` directory from existing repo + new generated script docs
|
# - Re-creates ``doc/build/html`` directory from existing repo + new generated script docs
|
||||||
|
|
||||||
# Usage:
|
# Usage:
|
||||||
## build_docs.sh [-o <out-dir>] [-g] [master|<repo> [<branch>]]
|
## build_docs.sh [-o <out-dir>] [-g] [master|<repo> [<branch>]]
|
||||||
@ -29,8 +29,8 @@ 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
|
||||||
|
|
||||||
DOCS_SOURCE=docs/source
|
DOCS_SOURCE=doc/source
|
||||||
HTML_BUILD=docs/html
|
HTML_BUILD=doc/build/html
|
||||||
|
|
||||||
# Keep track of the devstack directory
|
# Keep track of the devstack directory
|
||||||
TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
|
TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||||
@ -136,7 +136,7 @@ for f in $(find functions functions-common lib samples -type f -name \*); do
|
|||||||
mkdir -p $FQ_HTML_BUILD/`dirname $f`;
|
mkdir -p $FQ_HTML_BUILD/`dirname $f`;
|
||||||
$SHOCCO $f > $FQ_HTML_BUILD/$f.html
|
$SHOCCO $f > $FQ_HTML_BUILD/$f.html
|
||||||
done
|
done
|
||||||
echo "$FILES" >docs/files
|
echo "$FILES" >doc/files
|
||||||
|
|
||||||
if [[ -n $GH_UPDATE ]]; then
|
if [[ -n $GH_UPDATE ]]; then
|
||||||
GH_ROOT=$(mktemp -d work-gh-XXXX)
|
GH_ROOT=$(mktemp -d work-gh-XXXX)
|
||||||
|
|||||||