[jbosstools-commits] JBoss Tools SVN: r24788 - trunk/build.

Author: nickboldt Date: 2010-09-07 23:10:50 -0400 (Tue, 07 Sep 2010) New Revision: 24788 Modified: trunk/build/publish.sh Log: https://jira.jboss.org/browse/JBIDE-6956 replace jbosstools-3.2.0.M2 with 3.2.0.M2 for dgolovin Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-09-08 03:09:28 UTC (rev 24787) +++ trunk/build/publish.sh 2010-09-08 03:10:50 UTC (rev 24788) @@ -104,7 +104,7 @@ popd # collect component zips from upstream aggregated build jobs -if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then +if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then mkdir -p ${STAGINGDIR}/components for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Update*.zip") $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do mv $z ${STAGINGDIR}/components @@ -125,7 +125,7 @@ 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 [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then # reuse snippet from upstream build + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt" fi for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do @@ -168,7 +168,7 @@ if [[ -d ${STAGINGDIR} ]]; then # if an aggregate build, put output elsewhere on disk - if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html if [[ $1 == "trunk" ]]; then date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/ @@ -190,7 +190,7 @@ fi # extra publish step for aggregate update sites ONLY - if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then if [[ $1 == "trunk" ]]; then date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/ else