[jbosstools-commits] JBoss Tools SVN: r22455 - trunk/build.
Author: nickboldt
Date: 2010-06-01 11:16:22 -0400 (Tue, 01 Jun 2010)
New Revision: 22455
Modified:
trunk/build/build.xml
Log:
don't delete site/ folder before a svn up, but do an svn revert; don't run the
site build if it's already been done because of the component's agg pom.xml
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-01 14:06:54 UTC (rev 22454)
+++ trunk/build/build.xml 2010-06-01 15:16:22 UTC (rev 22455)
@@ -313,7 +313,7 @@
<if>
<istrue value="${svnant.enabled}" />
<then>
- <!-- remove generated site/ folder -->
+ <!-- remove generated site/ folder?
<if>
<not>
<equals arg1="@{component}" arg2="." />
@@ -324,12 +324,10 @@
quiet="true"
/>
</then>
- </if>
- <!--
+ </if> -->
<svn javahl="false" svnkit="true"
failonerror="false">
<revert recurse="${svn.recurse}" dir="@{component}"
/>
</svn>
- -->
<svn javahl="false" svnkit="true"
failonerror="false">
<update recurse="${svn.recurse}" dir="@{component}"
/>
</svn>
@@ -660,7 +658,7 @@
<ant antfile="${WORKINGDIR}/(a){COMPONENT}/build.xml">
<property name="COMPONENT" value="@{COMPONENT}" />
<property name="basedir" value="${WORKINGDIR}/@{COMPONENT}"
/>
- <property name="build.xml" value="${ant.file}"/>
+ <property name="build.xml" value="${ant.file}" />
</ant>
</then>
</if>
@@ -700,9 +698,18 @@
</not>
</and>
<then>
- <antcall target="create.update.site">
- <param name="COMPONENT" value="@{COMPONENT}" />
- </antcall>
+ <!-- only do this if the component's aggregate pom doesn't reference the
site/ folder, and therefore hasn't already build it -->
+ <loadfile property="component.pom.xml"
srcfile="${WORKINGDIR}/(a){COMPONENT}/pom.xml" />
+ <if>
+ <not>
+ <contains string="${component.pom.xml}"
substring="<module>site</module>" />
+ </not>
+ <then>
+ <antcall target="create.update.site">
+ <param name="COMPONENT" value="@{COMPONENT}" />
+ </antcall>
+ </then>
+ </if>
</then>
</if>
</sequential>