[jbosstools-commits] JBoss Tools SVN: r31663 - trunk/build/results.
Author: nickboldt
Date: 2011-05-31 00:39:58 -0400 (Tue, 31 May 2011)
New Revision: 31663
Modified:
trunk/build/results/build.xml
Log:
look in ${output.dir}/zips/ for build.properties.all.xml; cleaner input
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2011-05-31 04:11:42 UTC (rev 31662)
+++ trunk/build/results/build.xml 2011-05-31 04:39:58 UTC (rev 31663)
@@ -97,6 +97,8 @@
</if>
</sequential>
</macrodef>
+
+ <echoproperties/>
</target>
<!-- NEW STUFF HERE -->
@@ -134,22 +136,37 @@
</target>
<target name="buildResults" description="generate buildResults.html
from build properties" depends="init">
- <for param="propertiesFile" delimiter=", "
list="zips/build.properties.all.xml,
../../logs/zips/build.properties.all.xml">
+ <var name="propertiesFileFound" unset="true" />
+ <for param="propertiesFile" delimiter=", "
list="${output.dir}/zips/build.properties.all.xml, zips/build.properties.all.xml,
../../logs/zips/build.properties.all.xml">
<sequential>
<if>
- <available file="@{propertiesFile}" type="file"/>
+ <and>
+ <available file="@{propertiesFile}" type="file" />
+ <not>
+ <isset property="propertiesFileFound" />
+ </not>
+ </and>
<then>
+ <var name="propertiesFileFound" value="true" />
<delete quiet="true" file="buildResults.out.html" />
<xslt in="@{propertiesFile}" out="buildResults.out.html"
style="buildResults.xsl" force="true">
<classpath location="${COMMON_TOOLS}/saxon.jar" />
</xslt>
</then>
<else>
- <echo>Could not generate buildResults.out.html from
zips/build.properties.all.xml - file does not exist!</echo>
</else>
</if>
</sequential>
</for>
+ <if>
+ <not>
+ <isset property="propertiesFileFound" />
+ </not>
+ <then>
+ <echo>Could not generate buildResults.out.html from
zips/build.properties.all.xml - file does not exist!</echo>
+ </then>
+ </if>
+ <var name="propertiesFileFound" unset="true" />
</target>
</project>