diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -19,7 +19,7 @@ name="ant-contrib"
default="dist"
basedir="."
- xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant">
<property file="build.properties" />
@@ -53,7 +53,7 @@ <target name="init" unless="no-ivy">
<path id="ivy.lib.path">
- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
+ <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
<fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
<fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
<fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
@@ -61,13 +61,13 @@ <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
</path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant"
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant"
classpathref="ivy.lib.path"/>
</target>
<target name="configure" depends="init" unless="no-ivy">
- <ivy:configure file="ivy-conf.xml" />
+ <ivy:configure file="ivysettings.xml" />
</target>
<target name="resolve" depends="configure" unless="no-ivy">
@@ -75,9 +75,9 @@ </target>
<target name="classpath-ivy" depends="resolve" unless="no-ivy">
- <ivy:cachepath id="compile.classpath" type="jar" conf="provided" />
- <ivy:cachepath id="runtime.classpath" type="jar" conf="default" />
- <ivy:cachepath id="test.classpath" type="jar" conf="test" />
+ <ivy:cachepath pathid="compile.classpath" type="jar" conf="provided" />
+ <ivy:cachepath pathid="runtime.classpath" type="jar" conf="default" />
+ <ivy:cachepath pathid="test.classpath" type="jar" conf="test" />
<ivy:cachefileset setid="compile.fileset" type="jar" conf="provided" />
<ivy:cachefileset setid="runtime.fileset" type="jar" conf="default" />
<ivy:cachefileset setid="test.fileset" type="jar" conf="test" />
@@ -156,6 +156,8 @@ </target>
<target name="clean">
+ <mkdir dir="${target.dir}" /> + <mkdir dir="${dist.dir}" /> <delete includeemptydirs="true">
<fileset dir="${target.dir}" includes="**/*" />
<fileset dir="${dist.dir}" includes="**/*" />
|