Continued:

[jprojects-scripts.git] / make-javadoc.sh

diff --git a/make-javadoc.sh b/make-javadoc.sh
index baaf0fffc4c55d259da2cc934fe18e1948652b49..bf6efec8ccb02543ee0866e7bac382dd3b920da3 100755 (executable)
--- a/make-javadoc.sh
+++ b/make-javadoc.sh
@@ -20,6 +20,15 @@ for project in ${LIST}; do
                continue
        fi
 
+       IS_BASE_PROJECT=$(echo "${BASE_APPLICATION_NAMES}" | grep "${project}")
+
+       if [ -n "${IS_BASE_PROJECT}" ]
+       then
+               echo "$0: Project '${project}' is a base project, won't have Javadoc. Skipped ..."
+               continue
+       fi
+
+       echo "$0: Working on project '${project}' ..."
        cd "${JPROJECTS_HOME}/${project}" || exit 255
 
        HAS_FILE=$(find src/ -type f)
@@ -34,7 +43,8 @@ for project in ${LIST}; do
        rm -rf dist/javadoc/
 
        echo "$0: Generating documentation for '${project}' ..."
-       ant javadoc > dist/javadoc.log || exit 255
+       ${ANT_BIN} javadoc > dist/javadoc.log || exit 255
+       rm -fv dist/javadoc.log
 
        IS_COMPANY_PROJECT=$(echo "${COMPANY_PROJECTS}" | grep "${project}")
        if [ -n "${IS_COMPANY_PROJECT}" -a -z "$1" ]
@@ -44,13 +54,13 @@ for project in ${LIST}; do
        fi
 
        echo "$0: Generating 'javadoc/${project}' on remote server ..."
-       ssh "${UPLOAD_SERVER}" "mkdir -v \"${UPLOAD_BASE_PATH}/${project}\""
+       ${SSH_BIN} "${UPLOAD_SERVER}" "mkdir -vp \"${UPLOAD_BASE_PATH}/${project}\""
 
        echo "$0: Cleaning 'javadoc/${project}' on remote server ..."
-       ssh "${UPLOAD_SERVER}" "rm  -rf \"${UPLOAD_BASE_PATH}/${project}\"/*" || exit 255
+       ${SSH_BIN} "${UPLOAD_SERVER}" "rm  -rf \"${UPLOAD_BASE_PATH}/${project}\"/*" || exit 255
 
        echo "$0: Uploading Javadoc for '${project}' ..."
-       scp -r dist/javadoc/* "${UPLOAD_SERVER}:${UPLOAD_BASE_PATH}/${project}" || exit 255
+       ${SCP_BIN} -r dist/javadoc/* "${UPLOAD_SERVER}:${UPLOAD_BASE_PATH}/${project}" || exit 255
 
        echo "$0: Cleaning local documentation for '${project}' ..."
        rm -rf dist/javadoc/