Author: nickboldt Date: 2010-05-05 12:15:12 -0400 (Wed, 05 May 2010) New Revision: 21911 Modified: branches/modular_build/build/build.xml Log: fix purge task so it doesn't fail to run the pom Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-05 15:56:49 UTC (rev 21910) +++ branches/modular_build/build/build.xml 2010-05-05 16:15:12 UTC (rev 21911) @@ -92,19 +92,22 @@ </target> <!-- ******************* MAIN ENTRY TARGETS ******************* --> - <target name="clean-run" - description="purge m2 repo, then run build" - depends="purge, run" - /> - + <target name="clean-run" description="purge m2 repo, then run build" depends="purge, run" /> + <target name="purge" depends="init"> + <antcall target="genPomXml"> + <param name="COMPONENT" value="purge" /> + <param name="packaging" value="pom" /> + </antcall> <antcall target="mvn"> - <param name="COMPONENT" value="site" /> + <param name="COMPONENT" value="purge" /> + <param name="MAVEN_DIR" value="${WORKINGDIR}/purge/site" /> <param name="MAVEN_FLAGS" value="dependency:purge-local-repository -q -B -fae" /> <param name="noXvfb" value="true" /> </antcall> + <delete dir="${WORKINGDIR}/purge" includeemptydirs="true" quiet="true" /> </target> - + <target name="run" description="run a build, collect test results, generate overall update site" depends="build, collect.all.test.results, create.overall.update.site" @@ -119,7 +122,7 @@ description="run tests w/o first getting sources + list of components to build; assumes an upstream build job was already run" depends="init, get.bootstrap.scripts, get.components.to.test, run.build, collect.all.test.results" /> - + <!-- ******************* MAIN ENTRY TARGETS ******************* --> <!-- override for local build --> @@ -650,7 +653,9 @@ </antcall> <!-- Get correct version of site.xml + resolve variables --> - <loadfile property="site.xml.transformed" srcfile="${WORKINGDIR}/${update.site.path}/category.${product.id}.xml"> + <loadfile property="site.xml.transformed" + srcfile="${WORKINGDIR}/${update.site.path}/category.${product.id}.xml" + > <filterchain> <expandproperties /> </filterchain> @@ -742,18 +747,19 @@ </target> <!-- Used to build the update site of a component; requires a site.xml and pom.xml be generated first --> - <target name="create.update.site" depends="init, genSitePomXml, genSiteXml"> + <target name="create.update.site" depends="init, genPomXml, genSiteXml"> <antcall target="build.update.site"> <param name="COMPONENTS.to.build" value="${COMPONENT}" /> <param name="update.site.path" value="${COMPONENT}/site" /> </antcall> </target> - <target name="genSitePomXml" description="Generate a pom.xml to build update site"> - <property name="updateSiteJarDir" value="${WORKINGDIR}/${COMPONENT}/site" /> + <target name="genPomXml" description="Generate a pom.xml"> + <property name="pomDir" value="${WORKINGDIR}/${COMPONENT}/site" /> <property name="COMPONENT" value="${COMPONENT}" /> - <mkdir dir="${updateSiteJarDir}" /> - <echo file="${updateSiteJarDir}/pom.xml">&lt;project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; + <property name="packaging" value="eclipse-update-site" /> + <mkdir dir="${pomDir}" /> + <echo file="${pomDir}/pom.xml">&lt;project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt; &lt;parent&gt; &lt;relativePath&gt;../../parent-pom.xml&lt;/relativePath&gt; @@ -764,7 +770,7 @@ &lt;groupId&gt;org.jboss.tools&lt;/groupId&gt; &lt;artifactId&gt;${COMPONENT}.site&lt;/artifactId&gt; &lt;version&gt;0.0.1-SNAPSHOT&lt;/version&gt; - &lt;packaging&gt;eclipse-update-site&lt;/packaging&gt; + &lt;packaging&gt;${packaging}&lt;/packaging&gt; &lt;/project&gt; </echo>