Author: nickboldt Date: 2011-12-16 16:07:33 -0500 (Fri, 16 Dec 2011) New Revision: 37406 Modified: trunk/build/publish.sh Log: add COMMON_TOOLS folder to ant's lib folder Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2011-12-16 20:42:22 UTC (rev 37405) +++ trunk/build/publish.sh 2011-12-16 21:07:33 UTC (rev 37406) @@ -225,11 +225,15 @@ if [[ ! $ANT_HOME ]]; then # find ant in PATH - select LAST entry if more than one ANT_HOME=$(for d in $(echo ${PATH//:/ }); do if [[ ${d/ant/} != ${d} ]]; then echo -n " ${d%/bin}"; fi; done); ANT_HOME=${ANT_HOME##* } fi -ANT_EXEC=ant +ANT_EXEC="ant" if [[ -d ${ANT_HOME} ]] && [[ -x ${ANT_HOME}/bin/ant ]]; then export ANT_HOME=${ANT_HOME} ANT_EXEC=${ANT_HOME}/bin/ant fi +ANT_LIB="" # add COMMON_TOOLS folder to ant's lib folder +if [[ -d /home/hudson/static_build_env/jbds/tools ]]; then + ANT_LIB=" -lib /home/hudson/static_build_env/jbds/tools" +fi ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}" for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do if [[ -f ${buildxml} ]]; then @@ -238,7 +242,7 @@ fi done ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi -if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi +if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC}${ANT_LIB} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi # copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then