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

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2011-05-29 01:43:58 -0400 (Sun, 29 May 2011)
New Revision: 31607

Modified:
   trunk/build/publish.sh
Log:
re-enable results builder

Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh	2011-05-29 05:43:25 UTC (rev 31606)
+++ trunk/build/publish.sh	2011-05-29 05:43:58 UTC (rev 31607)
@@ -192,24 +192,14 @@
 md5sum $(find . -name "*Source*.zip" | egrep -v "aggregate-Sources|nightly-Update") >> ${md5sumsFile}
 echo " " >> ${md5sumsFile}
 
-# TODO: JBIDE-7045 this is obsolete - replace it with xslt'd transform of build.properties.all.xml (agg site overall metadata)
-# generate HTML snippet, download-snippet.html, for inclusion on jboss.org
-# TODO: currently broken; see https://issues.jboss.org/browse/JBIDE-7444
-#      [xslt] : Error! Error checking type of the expression 'funcall(replace, [funcall(substring-after, [cast(step("attribute", 17), string), literal-expr(jbosstools-)]), literal-expr(_stable_branch), literal-expr()])'.
-#     [xslt] : Fatal Error! Could not compile stylesheet
-
 mkdir -p ${STAGINGDIR}/logs
-#ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
-	# no longer using upstream continuous or nightly build in aggregation
-	#if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
-	#	ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.html"
-	#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}
+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}
+	fi
+done
+ant -f ${ANT_SCRIPT} ${ANT_PARAMS}
 
 # ${bl} is full build log; see above
 mkdir -p ${STAGINGDIR}/logs