Author: nickboldt Date: 2011-09-21 20:28:43 -0400 (Wed, 21 Sep 2011) New Revision: 34940 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: https://issues.jboss.org/browse/JBIDE-9743 pass JBT_VERSION into ant scripts; update example code for test-running locally Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-22 00:26:00 UTC (rev 34939) +++ branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-09-22 00:28:43 UTC (rev 34940) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -429,11 +427,7 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build Modified: branches/jbosstools-3.2.x/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/pom.xml 2011-09-22 00:26:00 UTC (rev 34939) +++ branches/jbosstools-3.2.x/build/aggregate/site/pom.xml 2011-09-22 00:28:43 UTC (rev 34940) @@ -35,10 +35,10 @@ <configuration> <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}"/> - - <!-- called AFTER generating update site + zip to add in extra content --> + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <ant antfile="build.xml"/> </tasks> 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-22 00:26:00 UTC (rev 34939) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-22 00:28:43 UTC (rev 34940) @@ -1,9 +1,7 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - - <!-- pass in properties to Maven/Ant via Hudson job: - -DJOB_NAME=${JOB_NAME} - -DBUILD_ID=${BUILD_ID} - -DBUILD_NUMBER=${BUILD_NUMBER} + <!-- + To test output, run maven in this folder: + $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> @@ -430,20 +428,11 @@ <target name="add.web.content"> <!-- - Properties needed for index.html are defined in aggregateSite.properties - update.site.description=Nightly Build - update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 - - or calculated here + Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) - - To test output, run in parent folder (bottests-site/): - $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 - or - $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.2.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> 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-22 00:26:00 UTC (rev 34939) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml 2011-09-22 00:28:43 UTC (rev 34940) @@ -17,13 +17,6 @@ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: mvn clean install -Pjbosstools-nightly-staging-composite --> - <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 --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... - <inputRepos>1</inputRepos> - </properties> - <build> <plugins> <plugin> @@ -37,9 +30,7 @@ <configuration> <quiet>true</quiet> <tasks> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> - + <property name="JBT_VERSION" value="${JBT_VERSION}"/> <!-- called AFTER generating update site + zip to add in extra content --> <ant antfile="build.xml"/> </tasks> @@ -95,14 +86,6 @@ <!-- add more inputRepo# here, ref'd above; need variables so that these can be referred to in Ant script later --> <repository> - <id>inputRepo1</id> - <url>${inputRepo1}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> <id>jbosstools-requirements-composite-mirror</id> <url>http://download.jboss.org/jbosstools/updates/helios/</url> <layout>p2</layout>