Author: nickboldt Date: 2010-08-11 17:41:52 -0400 (Wed, 11 Aug 2010) New Revision: 24070 Modified: trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/pom.xml Log: when building aggregate, collect child component update site zips too Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2010-08-11 21:04:29 UTC (rev 24069) +++ trunk/build/aggregate/site/build.xml 2010-08-11 21:41:52 UTC (rev 24070) @@ -178,8 +178,49 @@ </copy> </target> + <!-- look for http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...; + 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="aggegate.zips.dir" value="${output.dir}/zips" /> + <mkdir dir="${aggegate.zips.dir}" /> + <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoURL"> + <sequential> + <!-- fetch zip.list.txt file, if available --> + <get src=&quot;(a){repoURL}/logs/zip.list.txt&quot; dest="${aggegate.zips.dir}/zip.list.txt" ignoreerrors="true" /> + <if> + <available file="${aggegate.zips.dir}/zip.list.txt" type="file" /> + <then> + <!-- load zip.list.txt file, get ALL_ZIPS list --> + <property file="${aggegate.zips.dir}/zip.list.txt" /> + <if> + <isset property="ALL_ZIPS" /> + <then> + <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> + <sequential> + <propertyregex override="true" + property="relativePath" + defaultvalue="@{zipPath}" + input="@{zipPath}" + regexp="(.+/)[^/]+" + replace="\1" /> + <mkdir dir="${aggegate.zips.dir}/${relativePath}" /> + <!-- fetch zips to local dir --> + <get src="@{repoURL}/@{zipPath}" dest="${aggegate.zips.dir}/@{zipPath}" /> + <var name="relativePath" unset="true" /> + </sequential> + </for> + <var unset="true" name="ALL_ZIPS" /> + </then> + </if> + <delete file="${aggegate.zips.dir}/zip.list.txt" quiet="true" /> + </then> + </if> + </sequential> + </for> + </target> + <target name="custom.build" description="aggregate update site extras" - depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> + depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips" /> </project> Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-08-11 21:04:29 UTC (rev 24069) +++ trunk/build/aggregate/site/pom.xml 2010-08-11 21:41:52 UTC (rev 24070) @@ -13,6 +13,16 @@ <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> + <properties> + <!-- add more inputRepo# here, then reference below; need variables so + that these can be referred to in Ant script later --> + <inputRepo1>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... + <inputRepo2>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... + <inputRepo3>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... + <inputRepo4>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... + <inputRepos>inputRepo1,inputRepo2,inputRepo3,inputRepo4</inputRepos> + </properties> + <build> <plugins> <plugin> @@ -62,33 +72,35 @@ </build> <repositories> + <!-- add more inputRepo# here, ref'd above; need variables so that these + can be referred to in Ant script later --> <repository> - <id>jbosstools-continuous-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <id>inputRepo1</id> + <url>${inputRepo1}/all/repo/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>jbosstools-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <id>inputRepo2</id> + <url>${inputRepo2}/all/repo/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>jbosstools-pi4soa-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <id>inputRepo3</id> + <url>${inputRepo3}/all/repo/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> - <id>jbosstools-teiid-designer-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <id>inputRepo4</id> + <url>${inputRepo4}/all/repo/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled>