[jbosstools-commits] JBoss Tools SVN: r37470 - branches/jbosstools-3.3.0.M5/build.
Author: nickboldt
Date: 2011-12-20 17:11:46 -0500 (Tue, 20 Dec 2011)
New Revision: 37470
Modified:
branches/jbosstools-3.3.0.M5/build/publish.sh
Log:
backport antlib workaround for new Jenkins setup from trunk to 33x branch
Modified: branches/jbosstools-3.3.0.M5/build/publish.sh
===================================================================
--- branches/jbosstools-3.3.0.M5/build/publish.sh 2011-12-20 21:25:20 UTC (rev 37469)
+++ branches/jbosstools-3.3.0.M5/build/publish.sh 2011-12-20 22:11:46 UTC (rev 37470)
@@ -221,6 +221,19 @@
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_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
@@ -229,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 -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