[jbosstools-commits] JBoss Tools SVN: r23521 - branches/jbosstools-3.2.0.M1/build.

Author: nickboldt Date: 2010-07-19 01:26:14 -0400 (Mon, 19 Jul 2010) New Revision: 23521 Modified: branches/jbosstools-3.2.0.M1/build/publish.sh Log: add third dir option for where to find results/build.xml (aggregator case) Modified: branches/jbosstools-3.2.0.M1/build/publish.sh =================================================================== --- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-18 14:36:45 UTC (rev 23520) +++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-19 05:26:14 UTC (rev 23521) @@ -102,11 +102,12 @@ if [[ ${RELEASE} == "Yes" ]]; then mkdir -p ${STAGINGDIR}/logs ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}" - if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then - ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS} - elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then - ant -f ${WORKSPACE}/sources/build/results/build.xml ${ANT_PARAMS} - fi + for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do + if [[ -f ${buildxml} ]]; then + ANT_SCRIPT=${buildxml} + fi + done + ant -f ${ANT_SCRIPT} ${ANT_PARAMS} fi # get full build log and filter out Maven test failures