Author: nickboldt Date: 2012-06-12 17:51:52 -0400 (Tue, 12 Jun 2012) New Revision: 41900 Modified: trunk/build/publish/publish.sh Log: simplify process for generating index page in STAGINGDIR/ root, for .aggregate builds only Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-06-12 21:51:32 UTC (rev 41899) +++ trunk/build/publish/publish.sh 2012-06-12 21:51:52 UTC (rev 41900) @@ -267,35 +267,13 @@ 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##* } +# generate results page for an aggregate build only +if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/results ]]; then + pushd ${WORKSPACE}/sources/results >/dev/null + mvn install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR} + popd >/dev/null 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 - ANT_SCRIPT=${buildxml} - RESULTS_DIR=${buildxml/\/build.xml/} - 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}${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 - for f in buildResults.html buildResults.css; do - if [[ -f ${RESULTS_DIR}/${f} ]]; then rsync -arzq ${RESULTS_DIR}/${f} ${STAGINGDIR}/logs/; fi - done -fi - # purge duplicate zip files in logs/zips/all/*.zip if [[ -d ${STAGINGDIR}/logs/zips ]]; then rm -f $(find ${STAGINGDIR}/logs/zips -type f -name "*.zip"); fi