--- lang/java/build.xml 2010-08-31 01:52:04.000000000 +0200
+++ lang/java/build.xml-gil 2011-10-04 06:24:57.952553746 +0200
@@ -16,8 +16,7 @@
-->
<project name="Avro" default="compile"
- xmlns:ivy="antlib:org.apache.ivy.ant"
- xmlns:mvn="urn:maven-artifact-ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- Load user's default properties. -->
<property file="${user.home}/build.properties" />
@@ -139,11 +138,6 @@
<mkdir dir="${test.java.classes}"/>
<mkdir dir="${test.java.generated.classes}"/>
- <mkdir dir="${ivy.lib}"/>
- <mkdir dir="${ivy.test.lib}"/>
- <condition property="ivy.jar.exists">
- <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
- </condition>
</target>
<target name="javacc-check" depends="ivy-retrieve-build">
@@ -152,15 +146,14 @@
targetfile="${build.dir}/src/org/apache/avro/idl"/>
</target>
- <target name="javacc" depends="javacc-check" unless="javacc.uptodate">
+ <target name="javacc" unless="javacc.uptodate">
<mkdir dir="${build.dir}/src/org/apache/avro/idl"/>
- <copy tofile="${ivy.lib}/javacc.jar" file="${ivy.lib}/javacc-5.0.jar"/>
<javacc target="${java.src.dir}/org/apache/avro/idl/idl.jj"
outputdirectory="${build.dir}/src/org/apache/avro/idl"
- javacchome="${ivy.lib}"/>
+ javacchome="${lib.dir}"/>
</target>
- <target name="compile" depends="javacc,ivy-retrieve">
+ <target name="compile" depends="javacc">
<property name="depends.on.generated"
value="**/ipc/** **/*Requestor.java **/*Responder.java
**/tool/** **/mapred/**"/>
@@ -184,50 +177,24 @@
</target>
<target name="ivy-download" unless="ivy.jar.exists" depends="init">
- <delete dir="${lib.dir}"
- includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
- <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
- dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
</target>
<target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/>
- <!-- ensure that ivy taskdef is only run once, otw ant will error -->
- <property name="ivy.initialized" value="true"/>
</target>
<target name="ivy-retrieve-netty">
- <ivy:settings id="ivy.jboss.settings"
- file="${basedir}/ivysettings-jboss-repos.xml" />
- <ivy:retrieve type="jar" conf="default"
- settingsRef="ivy.jboss.settings"
- pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
- <ivy:retrieve type="bundle" conf="default"
- settingsRef="ivy.jboss.settings"
- pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve" depends="init,ivy-init,ivy-retrieve-netty">
- <ivy:retrieve type="jar" conf="default"
- pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve-tools" depends="init,ivy-init,ivy-retrieve-netty">
- <!-- Place in separate directory, since these artificats will
- be packaged in the tools jar. -->
- <ivy:retrieve type="jar" conf="tools"
- pattern="${ivy.lib}/tools/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve-test" depends="init,ivy-init,ivy-retrieve-netty">
- <ivy:retrieve type="jar" conf="test"
- pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve-build" depends="init,ivy-init,ivy-retrieve-netty">
- <ivy:retrieve type="jar" conf="build"
- pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
</target>
<macrodef name="java-compiler">
@@ -267,7 +234,7 @@
</jar>
</target>
- <target name="checkstyle-java" depends="compile, ivy-retrieve-test">
+ <target name="checkstyle-java" depends="compile">
<taskdef resource="checkstyletask.properties">
<classpath refid="test.java.classpath" />
</taskdef>
@@ -282,7 +249,7 @@
</checkstyle>
</target>
- <target name="compile-test-java" depends="ivy-retrieve-test,ivy-retrieve-tools,compile">
+ <target name="compile-test-java">
<java-avro-compiler src="${test.schemata.dir}"
generated="${test.java.generated.dir}"
dest="${test.java.generated.classes}"
@@ -340,7 +307,7 @@
<target name="test" depends="test-java,test-tools"/>
- <target name="rat" depends="ivy-retrieve-test">
+ <target name="rat">
<typedef resource="org/apache/rat/anttasks/antlib.xml"
uri="antlib:org.apache.rat.anttasks">
<classpath refid="test.java.classpath"/>
@@ -451,8 +418,8 @@
value="org.apache.avro.mapred.tether.WordCountTask"/>
</manifest>
<fileset dir="${build.classes}" />
- <zipgroupfileset dir="${ivy.lib}" includes="jackson*.jar"/>
- <zipgroupfileset dir="${ivy.test.lib}" includes="slf4j*.jar"/>
+ <zipgroupfileset dir="${lib.dir}" includes="jackson*.jar"/>
+ <zipgroupfileset dir="${lib.dir}" includes="slf4j*.jar"/>
<fileset dir="${test.java.classes}"
includes="org/apache/avro/mapred/tether/*"/>
<fileset dir="${test.java.generated.classes}"
@@ -461,7 +428,7 @@
<chmod file="${test.java.build.dir}/wordcount.jar" perm="ugo+x"/>
</target>
- <target name="tools" depends="compile,ivy-retrieve-tools"
+ <target name="tools" depends="compile"
description="Build standalone tools jar file">
<jar jarfile="${build.dir}/avro-tools-${version}.jar">
<manifest>
@@ -471,7 +438,7 @@
<attribute name="Implementation-Vendor" value="${Org}"/>
</manifest>
<fileset dir="${build.classes}" />
- <zipgroupfileset dir="${ivy.lib}/tools" includes="*.jar"/>
+ <zipgroupfileset dir="${lib.dir}" includes="*.jar"/>
</jar>
<chmod file="${build.dir}/avro-tools-${version}.jar" perm="ugo+x"/>
</target>
@@ -534,7 +501,7 @@
</jar>
</target>
- <target name="pom" depends="ivy-init">
+ <target name="pom" >
<ivy:makepom ivyfile="${basedir}/ivy.xml"
pomfile="${dist.dir}/${fullname}.pom">
<mapping conf="default" scope="compile"/>
@@ -635,33 +602,10 @@
<target name="mvn-install" depends="jar,pom,source,javadoc-jar"
description="Installs avro to local m2 cache">
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant"
- classpathref="java.classpath"/>
- <mvn:pom file="${dist.dir}/${fullname}.pom" id="avro"/>
- <mvn:install file="${build.dir}/${fullname}.jar">
- <attach file="${build.dir}/${fullname}-sources.jar"
- classifier="sources" />
- <attach file="${build.dir}/${fullname}-javadoc.jar"
- classifier="javadoc" />
- <pom refid="avro"/>
- </mvn:install>
</target>
<target name="mvn-deploy" depends="jar,pom,source,javadoc-jar"
description="Deploys Avro to Maven repo.">
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant"
- classpathref="java.classpath"/>
- <mvn:pom file="${dist.dir}/${fullname}.pom" id="avro"/>
- <mvn:deploy file="${build.dir}/${fullname}.jar">
- <remoteRepository id="avro.mvn.repo" url="${mvn.repo}"/>
- <attach file="${build.dir}/${fullname}-sources.jar"
- classifier="sources" />
- <attach file="${build.dir}/${fullname}-javadoc.jar"
- classifier="javadoc" />
- <pom refid="avro"/>
- </mvn:deploy>
</target>
</project>
