1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
|
Description: Ignore bundled dependencies
Author: Afif Elghraoui <afif@ghraoui.name>
Forwarded: not-needed
Last-Update: 2015-10-24
--- python-avro.orig/lang/py/build.xml
+++ python-avro/lang/py/build.xml
@@ -33,19 +33,15 @@
<!-- Python implementation directories -->
<property name="build.dir" value="${basedir}/build"/>
<property name="src.dir" value="${basedir}/src"/>
- <property name="lib.dir" value="${basedir}/lib"/>
<property name="test.dir" value="${basedir}/test"/>
- <property name="ivy.version" value="2.2.0"/>
- <property name="ivy.jar" value="${basedir}/lib/ivy-${ivy.version}.jar"/>
-
<!-- Load shared properties -->
<loadfile srcFile="${share.dir}/VERSION.txt" property="avro.version" />
<loadfile srcFile="${share.schema.dir}/org/apache/avro/ipc/HandshakeRequest.avsc" property="handshake.request.json"/>
<loadfile srcFile="${share.schema.dir}/org/apache/avro/ipc/HandshakeResponse.avsc" property="handshake.response.json"/>
<path id="java.classpath">
- <fileset dir="lib">
+ <fileset dir="/usr/share/java">
<include name="**/*.jar" />
</fileset>
</path>
@@ -58,17 +54,6 @@
<target name="init" description="Create the build directory.">
<mkdir dir="${build.dir}"/>
- <available file="${ivy.jar}" property="ivy.jar.found"/>
- <antcall target="ivy-download"/>
- <typedef uri="antlib:org.apache.ivy.ant">
- <classpath>
- <pathelement location="${ivy.jar}" />
- </classpath>
- </typedef>
- </target>
-
- <target name="ivy-download" unless="ivy.jar.found" >
- <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.jar}" usetimestamp="true" />
</target>
<target name="build"
@@ -87,9 +72,6 @@
<exclude name="**/*.py~"/>
</fileset>
</copy>
- <copy todir="${build.dir}/lib">
- <fileset dir="${lib.dir}" />
- </copy>
<!--Copy the protocols used for tethering -->
<copy todir="${build.dir}/src/avro/tether">
@@ -141,10 +123,6 @@
</filterset>
</copy>
- <!-- Ensure we have a local copy of the tools jar -->
- <ivy:retrieve
- pattern="${basedir}/../java/tools/target/[artifact]-[revision].[ext]"/>
-
<!-- Inline the location of the tools jar -->
<copy file="${test.dir}/test_tether_word_count.py"
toFile="${build.dir}/test/test_tether_word_count.py"
|