[jbosstools-commits] JBoss Tools SVN: r38043 - trunk/build/aggregate.
Author: nickboldt
Date: 2012-01-23 14:09:36 -0500 (Mon, 23 Jan 2012)
New Revision: 38043
Modified:
trunk/build/aggregate/build.xml
Log:
this script no longer depends on ../build.xml, which should soon be deprecated.
JBIDE-10690
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-01-23 19:02:56 UTC (rev 38042)
+++ trunk/build/aggregate/build.xml 2012-01-23 19:09:36 UTC (rev 38043)
@@ -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}/../../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>
- <!-- if can't calculate where build/build.xml is located, must pass in path from
parent when calling this script -->
-
<property name="update.site.source.dir"
value="${output.dir}/target/site" />
<!-- load properties from file -->
@@ -48,7 +31,8 @@
<property name="web.content.files" value="index.html, web/*.css,
README*, *directory.xml, site.xml, site.properties" />
<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" />
@@ -62,6 +46,16 @@
<target name="basic.build" description="JBT aggregate update site
extra processing steps"
depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip"
/>
<target name="custom.build" description="JBT aggregate update site
extra processing steps"
depends="basic.build,collect.zips,collect.metadata,create.summary.file" />
+ <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 ? -->
<property name="SAXON_MIRROR"
value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/s...
/>