svn commit: r1634919 - in /avro/trunk/lang/py: build.xml ivy.xml ivysettings.xml

[cu...@apache.org]

Author: cutting
Date: Tue Oct 28 17:06:33 2014
New Revision: 1634919

URL: http://svn.apache.org/r1634919
Log:
AVRO-570. Fix build to get avro-tools jar from snapshot repo when not built locally.

Added:
    avro/trunk/lang/py/ivy.xml   (with props)
    avro/trunk/lang/py/ivysettings.xml   (with props)
Modified:
    avro/trunk/lang/py/build.xml

Modified: avro/trunk/lang/py/build.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/build.xml?rev=1634919&r1=1634918&r2=1634919&view=diff
==============================================================================
--- avro/trunk/lang/py/build.xml (original)
+++ avro/trunk/lang/py/build.xml Tue Oct 28 17:06:33 2014
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<project name="Avro" default="dist">
+<project name="Avro" default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
  
   <!-- Load user's default properties. -->
   <property file="${user.home}/build.properties"/>
@@ -127,6 +127,10 @@
       </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"

Added: avro/trunk/lang/py/ivy.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/ivy.xml?rev=1634919&view=auto
==============================================================================
--- avro/trunk/lang/py/ivy.xml (added)
+++ avro/trunk/lang/py/ivy.xml Tue Oct 28 17:06:33 2014
@@ -0,0 +1,8 @@
+<ivy-module version="2.0">
+    <info organisation="org.apache.avro" module="python"/>
+    <configurations defaultconfmapping="default"/>
+    <dependencies>
+        <dependency org="org.apache.avro" name="avro-tools"
+                    rev="${avro.version}" transitive="false"/>
+    </dependencies>
+</ivy-module>

Propchange: avro/trunk/lang/py/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: avro/trunk/lang/py/ivysettings.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/ivysettings.xml?rev=1634919&view=auto
==============================================================================
--- avro/trunk/lang/py/ivysettings.xml (added)
+++ avro/trunk/lang/py/ivysettings.xml Tue Oct 28 17:06:33 2014
@@ -0,0 +1,9 @@
+<ivysettings>
+  <settings defaultResolver="repos" />
+  <resolvers>
+    <chain name="repos">
+      <ibiblio name="central" m2compatible="true"/>   
+      <ibiblio name="apache-snapshots" m2compatible="true" root="https://repository.apache.org/content/groups/snapshots"/>   
+    </chain>
+  </resolvers>
+</ivysettings>

Propchange: avro/trunk/lang/py/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native