Author: nickboldt Date: 2011-12-16 15:40:59 -0500 (Fri, 16 Dec 2011) New Revision: 37404 Modified: trunk/build/publish.sh Log: find actual ant executable -- seems that we can't just run any ol' ant exec anymore after latest Jenkins restart (2011-12-16 07:00 GMT) Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2011-12-16 19:30:56 UTC (rev 37403) +++ trunk/build/publish.sh 2011-12-16 20:40:59 UTC (rev 37404) @@ -221,6 +221,15 @@ echo " " >> ${md5sumsFile} mkdir -p ${STAGINGDIR}/logs + +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 +if [[ -d ${ANT_HOME} ]] && [[ -x ${ANT_HOME}/bin/ant ]]; then + export ANT_HOME=${ANT_HOME} + ANT_EXEC=${ANT_HOME}/bin/ant +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 @@ -229,7 +238,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 -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi +if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi # copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then