[jbosstools-commits] JBoss Tools SVN: r38726 - trunk/build/results.
Author: nickboldt
Date: 2012-02-14 14:55:56 -0500 (Tue, 14 Feb 2012)
New Revision: 38726
Modified:
trunk/build/results/build.xml
Log:
build/results/build.xml should not depend on build/build.xml (which is deprecated)
[JBIDE-10690]
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2012-02-14 19:36:11 UTC (rev 38725)
+++ trunk/build/results/build.xml 2012-02-14 19:55:56 UTC (rev 38726)
@@ -26,22 +26,15 @@
</condition>
<mkdir dir="${COMMON_TOOLS}" />
- <condition property="build.xml"
value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
- <available
file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"
type="file" />
- </condition>
- <condition property="build.xml"
value="${basedir}/../../build/build.xml">
- <available file="${basedir}/../../build/build.xml" type="file"
/>
- </condition>
- <condition property="build.xml"
value="${basedir}/../../build.xml">
- <available file="${basedir}/../../build.xml" type="file" />
- </condition>
- <condition property="build.xml"
value="${basedir}/../../sources/build.xml">
- <available file="${basedir}/../../sources/build.xml" type="file"
/>
- </condition>
- <condition property="build.xml"
value="${basedir}/../build.xml">
- <available file="${basedir}/../build.xml" type="file" />
- </condition>
- <!-- if can't calculate where build/build.xml is located, must pass in path from
parent when calling this script -->
+ <target name="get.ant-contrib"
unless="ant-contrib.jar.exists">
+ <property name="ANTCONTRIB_MIRROR"
value="http://downloads.sourceforge.net/ant-contrib/" />
+ <get usetimestamp="true"
dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" />
+ <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
+ <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
+ <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" overwrite="true"
/>
+ <copy
file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar"
tofile="${COMMON_TOOLS}/ant-contrib.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_"
includeemptydirs="true" quiet="true" />
+ </target>
<target name="get.saxon" unless="saxon.jar.exists">
<!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
@@ -54,26 +47,21 @@
</target>
<target name="init">
- <ant antfile="${build.xml}" target="init" />
+ <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file"
property="ant-contrib.jar.exists" />
+ <antcall target="get.ant-contrib" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
</classpath>
</taskdef>
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file"
property="saxon.jar.exists" />
+ <antcall target="get.saxon" />
+
<condition property="aggregate_site_build.xml"
value="${basedir}/../aggregate/build.xml">
<available file="${basedir}/../aggregate/build.xml" type="file"
/>
</condition>
- <condition property="aggregate_site_build.xml"
value="${basedir}/../aggregate/site/build.xml">
- <available file="${basedir}/../aggregate/site/build.xml"
type="file" />
- </condition>
- <condition property="aggregate_site_build.xml"
value="${basedir}/../aggregate/site/site/build.xml">
- <available file="${basedir}/../aggregate/site/site/build.xml"
type="file" />
- </condition>
- <available file="${COMMON_TOOLS}/saxon.jar" type="file"
property="saxon.jar.exists" />
- <antcall target="get.saxon" />
-
<macrodef name="get.size">
<attribute name="file" />
<attribute name="property" />