Author: nickboldt Date: 2011-09-21 21:06:50 -0400 (Wed, 21 Sep 2011) New Revision: 34951 Modified: trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/site/build.xml trunk/build/aggregate/soa-site/build.xml trunk/build/aggregate/webtools-site/build.xml Log: better formatting of version string -- want x.y.z.vYYYYMMDD-hhmm-Hxxx-Mx.typeOfBuild instead of x.y_trunkOrstable_branch.typeOfBuild.YYYY-MM-DD_hh_mm_ss-Hxxx Modified: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 01:01:47 UTC (rev 34950) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-22 01:06:50 UTC (rev 34951) @@ -445,16 +445,18 @@ <isset property="BUILD_NUMBER" /> </and> <then> + <!-- from 2011-09-21_01-11-04 to 20110921-0111 --> + <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> <if> <and> <isset property="JBT_VERSION" /> <isset property="BUILD_ALIAS" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> </then> <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> </else> </if> </then> Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-09-22 01:01:47 UTC (rev 34950) +++ trunk/build/aggregate/site/build.xml 2011-09-22 01:06:50 UTC (rev 34951) @@ -444,7 +444,20 @@ <isset property="BUILD_NUMBER" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <!-- from 2011-09-21_01-11-04 to 20110921-0111 --> + <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> + <if> + <and> + <isset property="JBT_VERSION" /> + <isset property="BUILD_ALIAS" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> + </then> + <else> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> + </else> + </if> </then> <else> <property name="update.site.version" value="" /> @@ -479,7 +492,7 @@ <delete file="${update.site.source.dir}/site.html" quiet="true" /> </target> - <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...; + <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...; if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch --> <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> Modified: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-09-22 01:01:47 UTC (rev 34950) +++ trunk/build/aggregate/soa-site/build.xml 2011-09-22 01:06:50 UTC (rev 34951) @@ -444,7 +444,20 @@ <isset property="BUILD_NUMBER" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <!-- from 2011-09-21_01-11-04 to 20110921-0111 --> + <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> + <if> + <and> + <isset property="JBT_VERSION" /> + <isset property="BUILD_ALIAS" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> + </then> + <else> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> + </else> + </if> </then> <else> <property name="update.site.version" value="" /> @@ -479,7 +492,7 @@ <delete file="${update.site.source.dir}/site.html" quiet="true" /> </target> - <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...; + <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...; if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch --> <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> Modified: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-09-22 01:01:47 UTC (rev 34950) +++ trunk/build/aggregate/webtools-site/build.xml 2011-09-22 01:06:50 UTC (rev 34951) @@ -445,16 +445,18 @@ <isset property="BUILD_NUMBER" /> </and> <then> + <!-- from 2011-09-21_01-11-04 to 20110921-0111 --> + <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> <if> <and> <isset property="JBT_VERSION" /> <isset property="BUILD_ALIAS" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> </then> <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> </else> </if> </then>