[jbosstools-commits] JBoss Tools SVN: r23419 - trunk/build.
Author: nickboldt
Date: 2010-07-15 12:13:32 -0400 (Thu, 15 Jul 2010)
New Revision: 23419
Modified:
trunk/build/publish.sh
Log:
move snapshot update site zip into /all/ folder along with /all/repo/
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-15 16:02:03 UTC (rev 23418)
+++ trunk/build/publish.sh 2010-07-15 16:13:32 UTC (rev 23419)
@@ -2,9 +2,13 @@
# Hudson script used to publish Tycho-built p2 update sites
# NOTE: sources MUST be checked out into ${WORKSPACE}/sources
+# where to create the stuff to publish
+STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
+
# releases get named differently than snapshots
if [[ ${RELEASE} == "Yes" ]]; then
ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}"
+ STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}-${ZIPSUFFIX}
else
ZIPSUFFIX="SNAPSHOT"
fi
@@ -18,9 +22,6 @@
if [[ $DESTINATION == "" ]]; then
DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/nightly/3.2.helios";
fi
-# where to create the stuff to publish
-STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
-
# cleanup from last time
rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR}
@@ -52,7 +53,7 @@
unzip -u -o -q -d ${STAGINGDIR}/all/repo $z
# copy into workspace for access by bucky aggregator (same name every time)
- rsync -aq $z ${STAGINGDIR}/${SNAPNAME}
+ rsync -aq $z ${STAGINGDIR}/all/${SNAPNAME}
fi
z=""
@@ -70,25 +71,20 @@
done
# if zips exist produced & renamed by ant script, copy them too
-if [[ ! -f ${WORKSPACE}/results/${SNAPNAME} ]]; then
- for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do
+if [[ ! -f ${STAGINGDIR}/all/${SNAPNAME} ]]; then
+ for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip" |
sort | tail -1); do
#echo "$z ..."
unzip -u -o -q -d ${STAGINGDIR}/ $z
- rsync -aq $z ${WORKSPACE}/results/${SNAPNAME}
+ rsync -aq $z ${STAGINGDIR}/all/${SNAPNAME}
done
fi
-# get sources zip
-if [[ -f ${WORKSPACE}/sources/build/sources/target/sources.zip ]]; then
- rsync -aq ${WORKSPACE}/sources/build/sources/target/sources.zip
${STAGINGDIR}/all/${SRCSNAME}
-else
- # create sources zip
- pushd ${WORKSPACE}/sources
- zip ${STAGINGDIR}/all/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x
requirements\* \
- -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\*
-x \*classes\* -x \*bin\* -x \*.zip \
- -x \*docs\* -x \*reference\* -x \*releng\*
- popd
-fi
+# create sources zip
+pushd ${WORKSPACE}/sources
+zip ${STAGINGDIR}/all/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x
requirements\* \
+ -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\*
-x \*classes\* -x \*bin\* -x \*.zip \
+ -x \*docs\* -x \*reference\* -x \*releng\*
+popd
# generate HTML snippet for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then