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

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2010-07-06 12:37:09 -0400 (Tue, 06 Jul 2010)
New Revision: 23252

Modified:
   trunk/build/publish.sh
Log:
accidentally overwriting 112M zip w/ all other produced zips (resulting in 40M xulrunner zip)

Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh	2010-07-06 15:14:39 UTC (rev 23251)
+++ trunk/build/publish.sh	2010-07-06 16:37:09 UTC (rev 23252)
@@ -11,22 +11,26 @@
 # cleanup from last time
 rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
 
-for z in ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/sources/site/target/site_assembly.zip; do
-	if [[ -f $z ]]; then
-		#echo "$z ..."
-		# note the job name, build number, and build ID of the latest snapshot zip
-		echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
-		echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
-		echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
-	
-		# unzip into workspace for publishing as unpacked site
-		unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
-	
-		# copy into workspace for access by bucky aggregator (same name every time)
-		rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
-	fi
-done
+siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
+if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
+	siteZip=${WORKSPACE}/sources/site/target/site.zip
+fi
 
+z=$siteZip
+if [[ -f $z ]]; then
+	#echo "$z ..."
+	# note the job name, build number, and build ID of the latest snapshot zip
+	echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
+	echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
+	echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
+
+	# unzip into workspace for publishing as unpacked site
+	unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
+
+	# copy into workspace for access by bucky aggregator (same name every time)
+	rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
+fi
+
 # if component zips exist, copy them too; first site.zip, then site_assembly.zip
 for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do 
 	#if [[ -f $z ]]; then
@@ -41,11 +45,13 @@
 done
 
 # if zips exist produced & renamed by ant script, copy them too
-for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do 
-	#echo "$z ..."
-	unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
-	rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
-done
+if [[ ! -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
+	for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do 
+		#echo "$z ..."
+		unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
+		rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
+	done
+fi
 
 # get full build log and filter out Maven test failures
 bl=${WORKSPACE}/site/${JOB_NAME}/BUILDLOG.txt