[jbosstools-commits] JBoss Tools SVN: r38046 - trunk/build/target-platform.
Author: nickboldt
Date: 2012-01-23 15:45:37 -0500 (Mon, 23 Jan 2012)
New Revision: 38046
Modified:
trunk/build/target-platform/build.xml
Log:
target-platform no longer needs ~/trunk/build/build.xml (JBIDE-10690)
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2012-01-23 20:45:28 UTC (rev 38045)
+++ trunk/build/target-platform/build.xml 2012-01-23 20:45:37 UTC (rev 38046)
@@ -17,23 +17,6 @@
</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 -->
-
<property name="repoDir" value="${WORKINGDIR}/REPO" />
<!--
********************************************************************************** -->
@@ -106,7 +89,8 @@
<!--
********************************************************************************** -->
<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" />
@@ -114,6 +98,17 @@
</taskdef>
</target>
+
+ <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.arch">
<condition property="ext" value="tar.gz"
else="zip">
<os family="unix" />