You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/12/17 18:23:53 UTC
[19/50] [abbrv] incubator-brooklyn git commit: install javadoc to the
right place
install javadoc to the right place
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/09b7b58e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/09b7b58e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/09b7b58e
Branch: refs/heads/master
Commit: 09b7b58e6ed5d9cd3e9b7c95e720309285e73f89
Parents: b86cbf0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Dec 16 10:52:52 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 17 02:02:56 2014 +0000
----------------------------------------------------------------------
docs/_build/build.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09b7b58e/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index b1a4032..4dfe7cd 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -33,7 +33,7 @@ function deduce_config() {
CONFIG=_config.yml,_build/config-production.yml,_build/config-website-root.yml
DIRS_TO_MOVE[0]=website
DIRS_TO_MOVE_TARGET[0]=""
- SKIP_JAVADOC=true
+ JAVADOC_TARGET=_site/guide/use/api/
SUMMARY="root production files, website in root and guide in /guide/"
;;
website-root)
@@ -42,6 +42,7 @@ function deduce_config() {
DIRS_TO_MOVE_TARGET[0]=""
DIRS_TO_MOVE[1]=guide
DIRS_TO_MOVE_TARGET[1]=long_grass
+ SKIP_JAVADOC=true
SUMMARY="user guide files in the root"
;;
guide-root)
@@ -50,6 +51,7 @@ function deduce_config() {
DIRS_TO_MOVE_TARGET[0]=""
DIRS_TO_MOVE[1]=website
DIRS_TO_MOVE_TARGET[1]=long_grass
+ JAVADOC_TARGET=_site/use/api/
SUMMARY="user guide files in the root"
;;
guide-version)
@@ -62,6 +64,7 @@ function deduce_config() {
DIRS_TO_MOVE_TARGET[1]=${DIRS_TO_MOVE_TARGET[0]}/style
DIRS_TO_MOVE[2]=website
DIRS_TO_MOVE_TARGET[2]=long_grass
+ JAVADOC_TARGET=_site/${DIRS_TO_MOVE_TARGET[1]}/use/api/
SUMMARY="user guide files in /${DIRS_TO_MOVE_TARGET[0]}"
;;
original)
@@ -107,8 +110,12 @@ make_jekyll || { echo ERROR: could not build docs in `pwd` ; exit 1 ; }
if [ "$SKIP_JAVADOC" != "true" ]; then
pushd _build > /dev/null
+ rm -rf target/apidocs
./make-javadoc.sh || { echo ERROR: failed javadoc build ; exit 1 ; }
popd > /dev/null
+ if [ ! -z "$JAVADOC_TARGET" ]; then
+ mv _build/target/apidocs/* $JAVADOC_TARGET
+ fi
fi
# TODO build catalog