Author: nickboldt Date: 2011-11-24 18:42:10 -0500 (Thu, 24 Nov 2011) New Revision: 36644 Modified: trunk/build/aggregate/bottests-site/site/pom.xml trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/sources/pom.xml trunk/build/aggregate/soa-site/pom.xml Log: use basedir instead of (optionally) using results/ folder as input Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644) @@ -26,12 +26,8 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <condition property="output.dir" value="${WORKSPACE}/results" - else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> <ant antfile="build.xml" target="basic.build" dir="../../"> - <property name="output.dir" value="${output.dir}" /> + <property name="output.dir" value="${basedir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> <property name="update.site.name" value="JBoss Tools - Bot Tests"/> Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643) +++ trunk/build/aggregate/site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644) @@ -25,12 +25,8 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <condition property="output.dir" value="${WORKSPACE}/results" - else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> <ant antfile="build.xml" target="custom.build" dir="../"> - <property name="output.dir" value="${output.dir}" /> + <property name="output.dir" value="${basedir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> <property name="update.site.name" value="JBoss Tools - Core"/> Modified: trunk/build/aggregate/site/sources/pom.xml =================================================================== --- trunk/build/aggregate/site/sources/pom.xml 2011-11-24 23:39:07 UTC (rev 36643) +++ trunk/build/aggregate/site/sources/pom.xml 2011-11-24 23:42:10 UTC (rev 36644) @@ -26,12 +26,8 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <condition property="output.dir" value="${WORKSPACE}/results" - else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> <ant antfile="build.xml" target="basic.build" dir="../../"> - <property name="output.dir" value="${output.dir}" /> + <property name="output.dir" value="${basedir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> <property name="update.site.name" value="JBoss Tools - Core Sources"/> Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-11-24 23:39:07 UTC (rev 36643) +++ trunk/build/aggregate/soa-site/pom.xml 2011-11-24 23:42:10 UTC (rev 36644) @@ -25,12 +25,8 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <condition property="output.dir" value="${WORKSPACE}/results" - else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> <ant antfile="build.xml" target="custom.build" dir="../"> - <property name="output.dir" value="${output.dir}" /> + <property name="output.dir" value="${basedir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> <property name="update.site.name" value="JBoss Tools - SOA Tooling"/>