summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorTommi Virtanen <tommi.virtanen@dreamhost.com>2011-12-22 17:17:20 -0800
committerJosh Durgin <josh.durgin@dreamhost.com>2012-01-09 19:03:56 -0800
commitc9606416660853aef78218d4e0578acc8df82a56 (patch)
tree95808bb5efca21da8542b5bb786cc254c90439b1 /admin
parent78cc07f6d3f0d83fe9a39e2f8733269a2b610411 (diff)
downloadceph-c9606416660853aef78218d4e0578acc8df82a56.tar.gz
doc: Switch doxygen integration from breathe to asphyxiate.
TODO: path of librados.h is now just the basename TODO: no enum support for now TODO: no @bug support for now Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/build-doc11
-rw-r--r--admin/doc-requirements.txt1
2 files changed, 1 insertions, 11 deletions
diff --git a/admin/build-doc b/admin/build-doc
index 2c6d1a94686..98aa626bbed 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -44,17 +44,6 @@ if [ ! -e virtualenv ]; then
fi
./virtualenv/bin/pip install --quiet -r ../admin/doc-requirements.txt
-# ugly kludge until breathe is distutils-friendly
-install -d breathe
-cd breathe
-if [ ! -e .git ]; then
- git init
-fi
-if [ -z "$(git rev-parse --default HEAD)" ]; then
- git pull --ff-only https://github.com/michaeljones/breathe.git master
-fi
-cd ..
-
install -d -m0755 \
output/html \
output/man
diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index 5ae6085073e..5a2ef98fc6f 100644
--- a/admin/doc-requirements.txt
+++ b/admin/doc-requirements.txt
@@ -1,2 +1,3 @@
Sphinx >=1.1.2
-e git+https://github.com/NewDreamNetwork/sphinx-ditaa.git#egg=sphinx-ditaa
+-e git+https://github.com/NewDreamNetwork/asphyxiate.git#egg=asphyxiate