Author: nickboldt Date: 2011-09-23 11:34:15 -0400 (Fri, 23 Sep 2011) New Revision: 35000 Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml branches/jbosstools-3.2.x/build/aggregate/site/pom.xml branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml Log: JBIDE-9743 backport trunk changes to 32x/41x branch Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-23 15:01:26 UTC (rev 34999) +++ branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-23 15:34:15 UTC (rev 35000) @@ -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: branches/jbosstools-3.2.x/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/pom.xml 2011-09-23 15:01:26 UTC (rev 34999) +++ branches/jbosstools-3.2.x/build/aggregate/site/pom.xml 2011-09-23 15:34:15 UTC (rev 35000) @@ -16,8 +16,9 @@ mvn clean install -P jbosstools-nightly-trunk --> <properties> - <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs - which need to be called by Ant script later --> + <!-- add more inputRepos into the composite metadata at the URL below. + Therefore need not edit this file and add dozens of URLs which need to be + called by Ant script later --> <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... <inputRepos>1</inputRepos> </properties> @@ -36,10 +37,12 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> - <property name="JBT_VERSION" value="${JBT_VERSION}"/> - <ant antfile="build.xml"/> + <property name="inputRepo1" value="${inputRepo1}" /> + <property name="inputRepos" value="${inputRepos}" /> + <ant antfile="build.xml"> + <property name="JBT_VERSION" value="${JBT_VERSION}" /> + <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> + </ant> </tasks> </configuration> <goals> Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-23 15:01:26 UTC (rev 34999) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-23 15:34:15 UTC (rev 35000) @@ -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: branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml 2011-09-23 15:01:26 UTC (rev 34999) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml 2011-09-23 15:34:15 UTC (rev 35000) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -12,11 +13,9 @@ <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> - <!-- to build against locally built sources, use: - mvn clean install - to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: - mvn clean install -Pjbosstools-nightly-staging-composite - --> + <!-- to build against locally built sources, use: mvn clean install to build + against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, + use: mvn clean install -Pjbosstools-nightly-staging-composite --> <build> <plugins> <plugin> @@ -31,8 +30,10 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <property name="JBT_VERSION" value="${JBT_VERSION}"/> - <ant antfile="build.xml"/> + <ant antfile="build.xml"> + <property name="JBT_VERSION" value="${JBT_VERSION}" /> + <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> + </ant> </tasks> </configuration> <goals>